X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=fd38ee5b193bdc9b219ea43953fb8524195e4d2a;hb=9e48b389990c0201487e58f3bac32734a59a7e89;hp=8cbbb4b85366f644fcbf8db1fe9780ea0f424e14;hpb=f73ae1fc5d5308fecf0a4bdbd7312f7f5b00df55;p=git.git

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 8cbbb4b8..fd38ee5b 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -1,15 +1,14 @@
 git-apply(1)
 ============
-v0.1, June 2005
 
 NAME
 ----
-git-apply - Apply patch on a GIT index file and a work tree
+git-apply - Apply patch on a git index file and a work tree
 
 
 SYNOPSIS
 --------
-'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
+'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -22,11 +21,6 @@ OPTIONS
 	The files to read patch from.  '-' can be used to read
 	from the standard input.
 
---no-merge::
-	The default mode of operation is the merge behaviour
-	which is not implemented yet.  This flag explicitly
-	tells the program not to use the merge behaviour.
-
 --stat::
 	Instead of applying the patch, output diffstat for the
 	input.  Turns off "apply".
@@ -51,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