X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=fd38ee5b193bdc9b219ea43953fb8524195e4d2a;hb=e24317b4d093e4b148996172d0b749f09a0e6f2e;hp=61d9dacc6f78555b73b55fd967489dd77015d458;hpb=b12bbd5986e1fae4120d7a415c1271c0273cad7e;p=git.git

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 61d9dacc..fd38ee5b 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] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -45,8 +45,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