git-merge: add --ff and --no-ff options
authorLars Hjemli <hjemli@gmail.com>
Sun, 23 Sep 2007 22:51:45 +0000 (00:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700)
commitd66424c...ac661c69640765260235452499d80378
tree26bfe87...5b77b05e2d09653d433ffc6789ee3d4ecopy hash to clipboard (tree)
parentd08af0a...745869a4fe36bc8df4f9804edfb74eb9copy hash to clipboard (diff)
Documentation/merge-options.txt
git-merge.sh
t/t7600-merge.sh