Skip to content

Commit

Permalink
Merge branch 'po/doc-status-markup'
Browse files Browse the repository at this point in the history
Update documentation mark-up.

* po/doc-status-markup:
  doc: fix 'git status --help' character quoting
  • Loading branch information
Junio C Hamano committed Oct 24, 2014
2 parents 26a22d8 + 7c45cee commit f35a02b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-status.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f35a02b

Please sign in to comment.