summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 10:41:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 10:41:33 -0700
commit44737c42280e513b782d73a790daf68f951237c3 (patch)
tree4418c327868757c98c7743d81b997838ded61d92 /merge-recursive.c
parentMerge branch 'pt/am-abort-fix' into maint (diff)
parentcompletion: teach 'scissors' mode to 'git commit --cleanup=' (diff)
downloadtgif-44737c42280e513b782d73a790daf68f951237c3.tar.xz
Merge branch 'sg/completion-commit-cleanup' into maint
* sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup='
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions