diff options
| author |  Jeff King <peff@peff.net> | 2012-05-08 04:55:35 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-05-08 04:55:35 -0400 |
| commit | 5410ae422b0f3cfe604d393addcd13526e940112 (patch) | |
| tree | e8273858fa5355dfefb5212eebd3289cfcf46c7d /Documentation | |
| parent | The ninth batch of topics graduated to 'master' (diff) | |
| parent | status: respect "-b" for porcelain format (diff) | |
| download | tgif-5410ae422b0f3cfe604d393addcd13526e940112.tar.xz | |
Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
* 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
Conflicts:
wt-status.h
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 2883a285ba..67e5f53a9e 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 ------------- |