git-merge: warn when -m provided on a fast forward
authorJ. Bruce Fields <bfields@fieldses.org>
Sun, 11 Mar 2007 16:28:56 +0000 (12:28 -0400)
committerJunio C Hamano <junkio@cox.net>
Mon, 12 Mar 2007 06:49:20 +0000 (23:49 -0700)
commitbe242d5...6c4457bec1cb748b144eb287e98ac0b5
treeb580a39...97889f79ca34f7c230786c1dbe51c26ecopy hash to clipboard (tree)
parent60fa08e...617dd148a9843bfdef2dfecf2ef60123copy hash to clipboard (diff)
git-merge.sh