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"
This commit is contained in:
Junio C Hamano 2009-05-13 21:05:59 -07:00
Родитель f29d669a91 c98a95eea8
Коммит 58066bec5a
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -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