From: Philip Oakley Date: Sun, 19 Oct 2014 14:17:15 +0000 (+0100) Subject: doc: fix 'git status --help' character quoting X-Git-Tag: v2.2.0-rc0~23^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c45cee6bb3a9727d88fd8ea9c681d49fd29220e;p=thirdparty%2Fgit.git doc: fix 'git status --help' character quoting Correct backtick quoting for some of the modification states to give consistent web rendering. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index def635f578..4d8d530d35 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -116,7 +116,7 @@ In the short-format, the status of each path is shown as 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 +index/worktree (i.e. the file is renamed). The `XY` is a two-letter status code. The fields (including the `->`) are separated from each other by a @@ -125,7 +125,7 @@ characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped. -For paths with merge conflicts, `X` and 'Y' show the modification +For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status