git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
authorGerrit Pape <pape@smarden.org>
Mon, 3 Mar 2008 09:22:03 +0000 (09:22 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2008 21:38:30 +0000 (13:38 -0800)
commite6d1f76...cf9de037c5479acdd9b6211e80145142
tree4d76faa...fca57f3a3809ff9457fb34abdf762458copy hash to clipboard (tree)
parentf23d1f7...273a59b030ea1028016e6a9fc9679d2ccopy hash to clipboard (diff)
git-merge.sh
t/t7600-merge.sh