[PATCH] Documentation: hooks: fix missing verb in pre-applypatch description

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
 Documentation/githooks.txt |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

	Manoj Srivastava a écrit :
	>         I am afraid I can't parse the final sentence: I assume it means
	>  that the patched working tree is not committed, but the missing verb
	>  makes it harder for non-native speakers of the english language to
	>  understand what is meant here.

	Perhaps something like this patch would fix it.

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 62ee065..0ede1ac 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -40,10 +40,11 @@ The default 'applypatch-msg' hook, when enabled, runs the
 pre-applypatch
 --------------
 
-This hook is invoked by `git-am`.  It takes no parameter,
-and is invoked after the patch is applied, but before a commit
-is made.  Exiting with non-zero status causes the working tree
-after application of the patch not committed.
+This hook is invoked by `git-am`.  It takes no parameter, and is
+invoked after the patch is applied, but before a commit is made.
+
+If it exits with non-zero status, then the working tree will not be
+committed after application of the patch.
 
 It can be used to inspect the current working tree and refuse to
 make a commit if it does not pass certain test.
-- 
1.5.5.1.100.gc23d

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux