From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Apr 2017 06:29:30 +0000 (-0700)
Subject: Merge branch 'mm/ls-files-s-doc'
X-Git-Tag: v2.13.0-rc0~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/97d9e97941a7f960704eb64a96f2f206b5dfb9a9?ds=inline;hp=-c

Merge branch 'mm/ls-files-s-doc'

Doc update.

* mm/ls-files-s-doc:
Documentation: document elements in "ls-files -s" output in order
---

97d9e97941a7f960704eb64a96f2f206b5dfb9a9
diff --combined Documentation/git-ls-files.txt
index 1cab703f73,521cb876c2..d153c17e06
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@@ -57,7 -57,7 +57,7 @@@ OPTION
  
  -s::
  --stage::
- 	Show staged contents' object name, mode bits and stage number in the output.
+ 	Show staged contents' mode bits, object name and stage number in the output.
  
  --directory::
  	If a whole directory is classified as "other", show just its
@@@ -77,8 -77,7 +77,8 @@@
  	succeed.
  
  -z::
 -	\0 line termination on output.
 +	\0 line termination on output and do not quote filenames.
 +	See OUTPUT below for more information.
  
  -x <pattern>::
  --exclude=<pattern>::
@@@ -197,10 -196,9 +197,10 @@@ the index records up to three such pair
  the user (or the porcelain) to see what should eventually be recorded at the
  path. (see linkgit:git-read-tree[1] for more information on state)
  
 -When `-z` option is not used, TAB, LF, and backslash characters
 -in pathnames are represented as `\t`, `\n`, and `\\`,
 -respectively.
 +Without the `-z` option, pathnames with "unusual" characters are
 +quoted as explained for the configuration variable `core.quotePath`
 +(see linkgit:git-config[1]).  Using `-z` the filename is output
 +verbatim and the line is terminated by a NUL byte.
  
  
  Exclude Patterns