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?hp=dfe46c5ce6e68d682f80f9874f0eb107e9fee797

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

Doc update.

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

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 1cab703f73..d153c17e06 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -57,7 +57,7 @@ OPTIONS
 
 -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