Skip to content

Commit d88156e

Browse files
author
Junio C Hamano
committed
Update documentation for C-style quoting.
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 71ac835 commit d88156e

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed

Documentation/diff-format.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ Example:
5555
:100644 100644 5be4a4...... 000000...... M file.c
5656
------------------------------------------------
5757

58+
When `-z` option is not used, TAB, LF, and backslash characters
59+
in pathnames are represented as `\t`, `\n`, and `\\`,
60+
respectively.
61+
62+
5863
Generating patches with -p
5964
--------------------------
6065

@@ -137,3 +142,7 @@ the file that rename/copy produces, respectively.
137142
rename to <path>
138143
similarity index <number>
139144
dissimilarity index <number>
145+
index <hash>..<hash> <mode>
146+
147+
3. TAB, LF, and backslash characters in pathnames are
148+
represented as `\t`, `\n`, and `\\`, respectively.

Documentation/git-apply.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree
88

99
SYNOPSIS
1010
--------
11-
'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
11+
'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--show-files] [--index-info] [-z] [<patch>...]
1212

1313
DESCRIPTION
1414
-----------
@@ -48,6 +48,20 @@ OPTIONS
4848
--show-files::
4949
Show summary of files that are affected by the patch.
5050

51+
--index-info::
52+
Newer git-diff output has embedded 'index information'
53+
for each blob to help identify the original version that
54+
the patch applies to. When this flag is given, and if
55+
the original version of the blob is available locally,
56+
outputs information about them to the standard output.
57+
58+
-z::
59+
When showing the index information, do not munge paths,
60+
but use NUL terminated machine readable format. Without
61+
this flag, the pathnames output will have TAB, LF, and
62+
backslash characters replaced with `\t`, `\n`, and `\\`,
63+
respectively.
64+
5165
--apply::
5266
If you use any of the options marked ``Turns off
5367
"apply"'' above, git-apply reads and outputs the

Documentation/git-ls-files.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OPTIONS
5454
succeed.
5555

5656
-z::
57-
\0 line termination on output
57+
\0 line termination on output.
5858

5959
-x|--exclude=<pattern>::
6060
Skips files matching pattern.
@@ -100,6 +100,10 @@ the dircache records up to three such pairs; one from tree O in stage
100100
the user (or the porcelain) to see what should eventually be recorded at the
101101
path. (see git-read-tree for more information on state)
102102

103+
When `-z` option is not used, TAB, LF, and backslash characters
104+
in pathnames are represented as `\t`, `\n`, and `\\`,
105+
respectively.
106+
103107

104108
Exclude Patterns
105109
----------------

Documentation/git-ls-tree.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Output Format
3838
-------------
3939
<mode> SP <type> SP <object> TAB <file>
4040

41+
When `-z` option is not used, TAB, LF, and backslash characters
42+
in pathnames are represented as `\t`, `\n`, and `\\`,
43+
respectively.
44+
4145

4246
Author
4347
------

0 commit comments

Comments
 (0)