From: Jeff King Date: Fri, 27 May 2011 02:31:11 +0000 (-0400) Subject: docs: minor grammar fixes to git-status X-Git-Tag: v1.7.5.4~3^2~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=043b5cd93859d25fa39cbbefd64e62d143b9baf0;p=git.git docs: minor grammar fixes to git-status Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 00b699fef..77027276b 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.