diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-16 00:12:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-16 00:12:58 -0700 |
| commit | 13c5833c094e3d889df8e4a4f0ff30bb874c1b14 (patch) | |
| tree | bec2e01906c7dd53a52d2f32cc81141931236666 | |
| parent | GIT 1.6.3.1 (diff) | |
| parent | Merge branch 'maint-1.6.1' into maint-1.6.2 (diff) | |
| download | tgif-13c5833c094e3d889df8e4a4f0ff30bb874c1b14.tar.xz | |
Merge branch 'maint-1.6.2' into maint
* maint-1.6.2:
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 f68e5c5c1a..c3fdccb4c2 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 |