mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'po/doc-status-markup'

Browse Source 
Update documentation mark-up.

* po/doc-status-markup:
  doc: fix 'git status --help' character quoting
This commit is contained in:
Junio C Hamano
2014-10-24 14:57:51 -07:00
parent 26a22d8d00 7c45cee6bb
commit f35a02b15d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-status.txt
View File

@ -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 where `PATH1` is the path in the `HEAD`, and the " `-> PATH2`" part is
shown only when `PATH1` corresponds to a different path in the 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. status code.
The fields (including the `->`) are separated from each other by a 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 literal: surrounded by ASCII double quote (34) characters, and with
interior special characters backslash-escaped. 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 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 conflicts, `X` shows the status of the index, and `Y` shows the status
of the work tree. For untracked paths, `XY` are `??`. Other status of the work tree. For untracked paths, `XY` are `??`. Other status