X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=626e281596c57d38b6df7bbf311494ee9c74da7f;hb=50b4e0c178777a27164eb67676593255a9cbd035;hp=eb8f90683724c69f1a47dfcc53d93e1d6accb3d0;hpb=7d8b7c21c9c0bee0d94fcf3b350e24ebdb920b74;p=git.git

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index eb8f9068..626e2815 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree
 
 SYNOPSIS
 --------
-'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [<patch>...]
+'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -72,6 +72,23 @@ OPTIONS
 	patch.  Give this flag after those flags to also apply
 	the patch.
 
+--no-add::
+	When applying a patch, ignore additions made by the
+	patch.  This can be used to extract common part between
+	two files by first running `diff` on them and applying
+	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
 ------