mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1: ls-tree manpage: output of ls-tree is compatible with update-index ls-tree manpage: use "unless" instead of "when ... is not"
This commit is contained in:
commit
213195185c
|
@ -82,8 +82,10 @@ Output Format
|
|||
-------------
|
||||
<mode> SP <type> SP <object> TAB <file>
|
||||
|
||||
When the `-z` option is not used, TAB, LF, and backslash characters
|
||||
Unless the `-z` option is used, TAB, LF, and backslash characters
|
||||
in pathnames are represented as `\t`, `\n`, and `\\`, respectively.
|
||||
This output format is compatible with what '--index-info --stdin' of
|
||||
'git update-index' expects.
|
||||
|
||||
When the `-l` option is used, format changes to
|
||||
|
||||
|
|
Loading…
Reference in a new issue