X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=6702a18c7e798018fc33c67001724c8e7d3a90ce;hb=313c4714c5ec1673805b952ba79d910a42e8937c;hp=61d9dacc6f78555b73b55fd967489dd77015d458;hpb=d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab;p=git.git

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 61d9dacc..6702a18c 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] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
+'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [-z] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -25,6 +25,12 @@ OPTIONS
 	Instead of applying the patch, output diffstat for the
 	input.  Turns off "apply".
 
+--numstat::
+	Similar to \--stat, but shows number of added and
+	deleted lines in decimal notation and pathname without
+	abbreviation, to make it more machine friendly.  Turns
+	off "apply".
+
 --summary::
 	Instead of applying the patch, output a condensed
 	summary of information obtained from git diff extended
@@ -45,8 +51,19 @@ OPTIONS
 	up-to-date, it is flagged as an error.  This flag also
 	causes the index file to be updated.
 
---show-files::
-	Show summary of files that are affected by the patch.
+--index-info::
+	Newer git-diff output has embedded 'index information'
+	for each blob to help identify the original version that
+	the patch applies to.  When this flag is given, and if
+	the original version of the blob is available locally,
+	outputs information about them to the standard output.
+
+-z::
+	When showing the index information, do not munge paths,
+	but use NUL terminated machine readable format.  Without
+	this flag, the pathnames output will have TAB, LF, and
+	backslash characters replaced with `\t`, `\n`, and `\\`,
+	respectively.
 
 --apply::
 	If you use any of the options marked ``Turns off
@@ -55,6 +72,12 @@ 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.
 
 Author
 ------