diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:55 -0700 |
| commit | 880bd9d08081752bb4e2891aa3c16c82808ecb2e (patch) | |
| tree | 03528a146b1e7cca8a7c57b1f9574d05a9ec9ffd /Documentation | |
| parent | 7c1b228d26107d2cac9fd9549a6a1cff41c24b51 (diff) | |
| parent | 46077fa5d477a3e96e0bb96042a2a9fdc9c818cb (diff) | |
| download | git-880bd9d08081752bb4e2891aa3c16c82808ecb2e.tar.gz git-880bd9d08081752bb4e2891aa3c16c82808ecb2e.tar.xz | |
Merge branch 'mg/status-b'
* mg/status-b:
Documentation+t5708: document and test status -s -b
Show branch information in short output of git status
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-status.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 2d4bbfcaf..fd0fe7cb5 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -27,6 +27,10 @@ OPTIONS --short:: Give the output in the short-format. +-b:: +--branch:: + Show the branch and tracking info even in short-format. + --porcelain:: Give the output in a stable, easy-to-parse format for scripts. Currently this is identical to --short output, but is guaranteed @@ -120,6 +124,10 @@ Ignored files are not listed. ? ? untracked ------------------------------------------------- +If -b is used the short-format status is preceded by a line + +## branchname tracking info + There is an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '->' is omitted from rename entries and the field @@ -128,7 +136,7 @@ order is reversed (e.g 'from -> to' becomes 'to from'). Second, a NUL and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or -backslash-escaping is performed. +backslash-escaping is performed. Fourth, there is no branch line. CONFIGURATION ------------- |