summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorPhilip Oakley <philipoakley@iee.org>2014-10-19 15:17:15 +0100
committerJunio C Hamano <gitster@pobox.com>2014-10-19 20:45:16 -0700
commit7c45cee6bb3a9727d88fd8ea9c681d49fd29220e (patch)
tree48c8aded6350ca94f2fbcd4a9185b31dbaa158dd /Documentation
parent3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (diff)
downloadgit-7c45cee6bb3a9727d88fd8ea9c681d49fd29220e.tar.gz
doc: fix 'git status --help' character quotingpo/doc-status-markup
Correct backtick quoting for some of the modification states to give consistent web rendering. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-status.txt4
1 files changed, 2 insertions, 2 deletions
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