summaryrefslogtreecommitdiffstats
path: root/git-apply.html
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.html
parent1d25a9c06366804d45430e56b99d9440a365fd14 (diff)
downloadgit-htmldocs-9adfc6a1edab792a2e46eaaa78a6f7863c855e18.tar.gz
Autogenerated HTML docs for v1.4.2-g370e
Diffstat (limited to 'git-apply.html')
-rw-r--r--git-apply.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-apply.html b/git-apply.html
index 077a8673b..733a07544 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -389,8 +389,8 @@ and a work tree.</p>
For atomicity, <a href="git-apply.html">git-apply(1)</a> 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.
</p>
</dd>
<dt>
@@ -573,7 +573,7 @@ apply.whitespace
</div>
<div id="footer">
<div id="footer-text">
-Last updated 26-Aug-2006 08:43:06 UTC
+Last updated 28-Aug-2006 07:18:32 UTC
</div>
</div>
</body>