diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:49:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:49:46 -0700 |
| commit | f7858ad1e1686ff65cc77989c49f13352934adbc (patch) | |
| tree | dcfff9ae3f2959898333a6d3bf4165cf7c11092f /Documentation | |
| parent | 1652867c73a193359519ff10217c03f850a76a86 (diff) | |
| parent | 4d2292e9a90465cbfa23f1c170c11423d11830df (diff) | |
| download | git-f7858ad1e1686ff65cc77989c49f13352934adbc.tar.gz git-f7858ad1e1686ff65cc77989c49f13352934adbc.tar.xz | |
Merge branch 'jk/status-porcelain-z-b'
"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
via Jeff King
* jk/status-porcelain-z-b:
status: refactor colopts handling
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 2883a285b..67e5f53a9 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -184,7 +184,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 ------------- |