diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-13 21:06:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-13 21:06:11 -0700 |
| commit | 213195185c8aa09d6192b85a3f78bf46f19f51a4 (patch) | |
| tree | 845e38396c86ca775bdcad2b6158c707fd315238 /Documentation/git-ls-tree.txt | |
| parent | a83502f8e59b1dd2547f850379040ca3f931e00b (diff) | |
| parent | 58066bec5a2cd8f5b6bb4884c8162364374ba0c1 (diff) | |
| download | git-213195185c8aa09d6192b85a3f78bf46f19f51a4.tar.gz git-213195185c8aa09d6192b85a3f78bf46f19f51a4.tar.xz | |
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"
Diffstat (limited to 'Documentation/git-ls-tree.txt')
| -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 f68e5c5c1..c3fdccb4c 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 |