diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-25 04:32:30 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-25 04:32:30 +0400 |
| commit | a8bd582d3079e506c525fe1b735d6ea405576bff (patch) | |
| tree | 64d36608aba9820111b3a4aa853c43d280547822 /Documentation | |
| parent | 17a9ac7d6b5f27eb5f8efee324e88db2b6ec9bd6 (diff) | |
| parent | d4a6bf1fb64d904e210fbf7c5b330b06438a5bd5 (diff) | |
Merge branch 'jk/maint-status-porcelain-z-b' into maint
"git status --porcelain" ignored "--branch" option by mistake. The output
for "git status --branch -z" was also incorrect and did not terminate the
record for the current branch name with NUL as asked.
By Jeff King
* jk/maint-status-porcelain-z-b:
status: respect "-b" for porcelain format
status: fix null termination with "-b"
status: refactor null_termination option
commit: refactor option parsing
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-status.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index a29aae60cd..277e1e2ca3 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -177,7 +177,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. Fourth, there is no branch line. +backslash-escaping is performed. CONFIGURATION ------------- |