diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-14 04:05:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-14 04:05:59 (GMT) |
| commit | 58066bec5a2cd8f5b6bb4884c8162364374ba0c1 (patch) | |
| tree | ffda17b9a7ebbca8a7c96fc43a4e70c134dbd108 | |
| parent | f29d669a91b2c8f1c68c1f4fb10f03456a997fa8 (diff) | |
| parent | c98a95eea825ffe66ed690064c80733656506c66 (diff) | |
| download | git-58066bec5a2cd8f5b6bb4884c8162364374ba0c1.zip git-58066bec5a2cd8f5b6bb4884c8162364374ba0c1.tar.gz git-58066bec5a2cd8f5b6bb4884c8162364374ba0c1.tar.bz2 | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"
| -rw-r--r-- | Documentation/git-ls-tree.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt index db6ebcc..2370731 100644 --- a/Documentation/git-ls-tree.txt +++ b/Documentation/git-ls-tree.txt @@ -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 |