Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
commit5410ae422b0f3cfe604d393addcd13526e940112
authorJeff King <peff@peff.net>
Tue, 8 May 2012 08:55:35 +0000 (8 04:55 -0400)
committerJeff King <peff@peff.net>
Tue, 8 May 2012 08:55:35 +0000 (8 04:55 -0400)
treee8273858fa5355dfefb5212eebd3289cfcf46c7d
parenta3935e6791c619a9f2f472e9e553d45d88c4e263
parentd4a6bf1fb64d904e210fbf7c5b330b06438a5bd5
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
Documentation/git-status.txt
builtin/commit.c
t/t7508-status.sh
wt-status.c
wt-status.h