diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:43:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:43:04 -0700 |
| commit | badabc06f3f34a85a931dffa8e8d607d2ff016fc (patch) | |
| tree | a18d3b797aac88c667b5fb5a5cf79c08274d8709 /Documentation/git-status.txt | |
| parent | Merge branch 'ef/checkout-empty' into maint (diff) | |
| parent | docs: stop using asciidoc no-inline-literal (diff) | |
| download | git-badabc06f3f34a85a931dffa8e8d607d2ff016fc.tar.gz git-badabc06f3f34a85a931dffa8e8d607d2ff016fc.zip | |
Merge branch 'jk/doc-asciidoc-inline-literal' into maint
By Jeff King
* jk/doc-asciidoc-inline-literal:
docs: stop using asciidoc no-inline-literal
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 3d51717bbe..a29aae60cd 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -98,12 +98,12 @@ In the short-format, the status of each path is shown as XY PATH1 -> PATH2 -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 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 +The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with |