projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3935e6 d4a6bf1)
Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
authorJeff King <peff@peff.net>
Tue, 8 May 2012 08:55:35 +0000 (04:55 -0400)
committerJeff King <peff@peff.net>
Tue, 8 May 2012 08:55:35 +0000 (04:55 -0400)
commit5410ae422b0f3cfe604d393addcd13526e940112
treee8273858fa5355dfefb5212eebd3289cfcf46c7dtree | snapshot
parenta3935e6791c619a9f2f472e9e553d45d88c4e263commit | diff
parentd4a6bf1fb64d904e210fbf7c5b330b06438a5bd5commit | diff
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 diff1 | diff2 | blob | history
builtin/commit.c diff1 | diff2 | blob | history
t/t7508-status.sh diff1 | diff2 | blob | history
wt-status.c diff1 | diff2 | blob | history
wt-status.h diff1 | diff2 | blob | history
Git—the stupid content tracker