aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-14 21:56:46 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-17 17:41:56 -0700
commitd88156e943ab4ab5990fb8929fc432f7638df7f6 (patch)
tree6ae0da58f99832249935dd9cfc2ce97f2e7291d4 /Documentation/git-apply.txt
parent71ac8356d8f64e2408e49ee8bf35d4e69cc9359e (diff)
downloadgit-d88156e943ab4ab5990fb8929fc432f7638df7f6.tar.gz
git-d88156e943ab4ab5990fb8929fc432f7638df7f6.tar.xz
Update documentation for C-style quoting.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r--Documentation/git-apply.txt16
1 files changed, 15 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 61d9dacc6..e928088e4 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] [--show-files] [--index-info] [-z] [<patch>...]
DESCRIPTION
-----------
@@ -48,6 +48,20 @@ OPTIONS
--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
"apply"'' above, git-apply reads and outputs the