summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-06 18:40:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-06 18:40:08 (GMT)
commit6c92972d7f5ab247a8cab5e4b88cb281bf201970 (patch)
tree2a5100a10d4b91a59dea75ef73184142479c8963 /builtin/branch.c
parenta6605d76cdad37ed3c55a7be4d2e0af0f4721bb2 (diff)
parent000f97bd11e94fa8ede7fcdb43f5633997fed672 (diff)
downloadgit-6c92972d7f5ab247a8cab5e4b88cb281bf201970.zip
git-6c92972d7f5ab247a8cab5e4b88cb281bf201970.tar.gz
git-6c92972d7f5ab247a8cab5e4b88cb281bf201970.tar.bz2
Merge branch 'bc/maint-status-z-to-use-porcelain'
* bc/maint-status-z-to-use-porcelain: builtin/commit.c: set status_format _after_ option parsing t7508: demonstrate status's failure to use --porcelain format with -z Conflicts: builtin/commit.c
Diffstat (limited to 'builtin/branch.c')
0 files changed, 0 insertions, 0 deletions