merge script: handle --no-ff --no-commit correctly
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:11:03 +0000 (02:11 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000 (14:02 -0700)
commit2a70fa4...1e377bc68bcabdc1a550e9970acccda7
treed1b19f8...8eaeba736f1fe2ad704a1294772a192fcopy hash to clipboard (tree)
parentf07df52...89c78c33c5c5c1bd973038283c401582copy hash to clipboard (diff)
contrib/examples/git-merge.sh