Merge branch 'jc/merge-msg' into next

[git.git] / Documentation / git-apply.txt

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 6702a18..75076b6 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -8,7 +8,10 @@ git-apply - Apply patch on a git index file and a work tree
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [-z] [<patch>...]
+[verse]
+'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
+         [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]
+         [<patch>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -65,6 +68,10 @@ OPTIONS
        backslash characters replaced with `\t`, `\n`, and `\\`,
        respectively.
 
        backslash characters replaced with `\t`, `\n`, and `\\`,
        respectively.
 

+-p<n>::
+       Remove <n> leading slashes from traditional diff paths. The
+       default is 1.
+

 --apply::
        If you use any of the options marked ``Turns off
        "apply"'' above, git-apply reads and outputs the
 --apply::
        If you use any of the options marked ``Turns off
        "apply"'' above, git-apply reads and outputs the


@@ -79,6 +86,17 @@ OPTIONS
        the result with this option, which would apply the
        deletion part but not addition part.
 
        the result with this option, which would apply the
        deletion part but not addition part.
 

+--allow-binary-replacement::
+       When applying a patch, which is a git-enhanced patch
+       that was prepared to record the pre- and post-image object
+       name in full, and the path being patched exactly matches
+       the object the patch applies to (i.e. "index" line's
+       pre-image object name is what is in the working tree),
+       and the post-image object is available in the object
+       database, use the post-image object as the patch
+       result.  This allows binary files to be patched in a
+       very limited way.
+

 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>