summaryrefslogtreecommitdiffstats
path: root/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-08-28 07:18:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-08-28 07:18:38 +0000
commit9adfc6a1edab792a2e46eaaa78a6f7863c855e18 (patch)
treef96a51946733528f4d4e5bab36d23a71af9ec910 /git-apply.txt
parent1d25a9c06366804d45430e56b99d9440a365fd14 (diff)
downloadgit-htmldocs-9adfc6a1edab792a2e46eaaa78a6f7863c855e18.tar.gz
Autogenerated HTML docs for v1.4.2-g370e
Diffstat (limited to 'git-apply.txt')
-rw-r--r--git-apply.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-apply.txt b/git-apply.txt
index 20e12ceda..c76cfffdc 100644
--- a/git-apply.txt
+++ b/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,