summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-05-27 02:31:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-27 05:15:35 (GMT)
commit043b5cd93859d25fa39cbbefd64e62d143b9baf0 (patch)
treeb0ba7dd67cfad9c5b943ecbca6d9ea533c2c65e9
parent3c3e0b3c41f4c975828cf51d661614e45bf80dc0 (diff)
downloadgit-043b5cd93859d25fa39cbbefd64e62d143b9baf0.zip
git-043b5cd93859d25fa39cbbefd64e62d143b9baf0.tar.gz
git-043b5cd93859d25fa39cbbefd64e62d143b9baf0.tar.bz2
docs: minor grammar fixes to git-status
Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-status.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 00b699f..7702727 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -78,18 +78,19 @@ OUTPUT
The output from this command is designed to be used as a commit
template comment, and all the output lines are prefixed with '#'.
The default, long format, is designed to be human readable,
-verbose and descriptive. They are subject to change in any time.
+verbose and descriptive. Its contents and format are subject to change
+at any time.
The paths mentioned in the output, unlike many other git commands, are
made relative to the current directory if you are working in a
subdirectory (this is on purpose, to help cutting and pasting). See
the status.relativePaths config option below.
-In short-format, the status of each path is shown as
+In the short-format, the status of each path is shown as
XY PATH1 -> PATH2
-where `PATH1` is the path in the `HEAD`, and ` -> PATH2` part is
+where `PATH1` is the path in the `HEAD`, and the ` -> PATH2` part is
shown only when `PATH1` corresponds to a different path in the
index/worktree (i.e. the file is renamed). The 'XY' is a two-letter
status code.