diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-24 14:57:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-24 14:57:51 -0700 |
| commit | f35a02b15d22521c4902d8b3434c7c55eeab4a1d (patch) | |
| tree | 412981ac30667c4d298b602347e0b793c6615137 /Documentation/git-status.txt | |
| parent | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' (diff) | |
| parent | doc: fix 'git status --help' character quoting (diff) | |
| download | tgif-f35a02b15d22521c4902d8b3434c7c55eeab4a1d.tar.xz | |
Merge branch 'po/doc-status-markup'
Update documentation mark-up.
* po/doc-status-markup:
doc: fix 'git status --help' character quoting
Diffstat (limited to 'Documentation/git-status.txt')
| -rw-r--r-- | Documentation/git-status.txt | 4 |
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 |