summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-21 14:02:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-21 14:02:51 -0700
commit42e129f47af19c7623bac39f20c74b4d349a81f9 (patch)
treeff5eef5175833d31be8b917b648bb2f610a52ff5 /builtin/merge-recursive.c
parentMerge branch 'ap/maint-update-index-h-is-for-help' (diff)
parentbranch: segfault fixes and validation (diff)
downloadtgif-42e129f47af19c7623bac39f20c74b4d349a81f9.tar.xz
Merge branch 'nd/branch-error-cases'
"git branch" had more cases where it did not bother to check nonsense command line parameters. * nd/branch-error-cases: branch: segfault fixes and validation
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions