summaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-27 17:51:05 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-27 17:51:05 -0700
commitb32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd (patch)
treeea8f2b5b30822c350cd9b5e6428d86ee53c706f8 /Documentation/git-apply.txt
parent2e6183840e5c8f1a478975346549be7440405175 (diff)
parent8938045a4eae7a9c39631508a3c3d34c50c6257a (diff)
downloadgit-b32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd.tar.gz
Merge branch 'jc/apply'
* jc/apply: git-apply --reject: finishing touches. apply --reject: count hunks starting from 1, not 0 git-apply --verbose git-apply --reject: send rejects to .rej files. git-apply --reject apply --reverse: tie it all together. diff.c: make binary patch reversible. builtin-apply --reverse: two bugfixes.
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r--Documentation/git-apply.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 20e12ceda0..c76cfffdc6 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -75,8 +75,8 @@ OPTIONS
For atomicity, gitlink:git-apply[1] by default fails the whole patch and
does not touch the working tree when some of the hunks
do not apply. This option makes it apply
- the parts of the patch that are applicable, and send the
- rejected hunks to the standard output of the command.
+ the parts of the patch that are applicable, and leave the
+ rejected hunks in corresponding *.rej files.
-z::
When showing the index information, do not munge paths,