merge script: --ff-only to disallow true merge
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:10:17 +0000 (02:10 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000 (14:02 -0700)
commitf07df52...89c78c33c5c5c1bd973038283c401582
treea575b81...23a2766dce1188e37dd76d45e92c4804copy hash to clipboard (tree)
parentd9a680a...f68caef16b5f316ed7917d8160d3578acopy hash to clipboard (diff)
contrib/examples/git-merge.sh