Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
doc: fix 'git status --help' character quoting
author
Philip Oakley
<philipoakley@iee.org>
Sun, 19 Oct 2014 14:17:15 +0000
(15:17 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 20 Oct 2014 03:45:16 +0000
(20:45 -0700)
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>
Documentation/git-status.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
3c2dc76
)
diff --git
a/Documentation/git-status.txt
b/Documentation/git-status.txt
index def635f57879c467d85f43d44aafac90c7f72a9a..4d8d530d3542801337f7970b669514af3131ac99 100644
(file)
--- 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
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
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.
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
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