git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 60fa08e)
git-merge: warn when -m provided on a fast forward
authorJ. Bruce Fields <redacted>
Sun, 11 Mar 2007 16:28:56 +0000 (12:28 -0400)
committerJunio C Hamano <redacted>
Mon, 12 Mar 2007 06:49:20 +0000 (23:49 -0700)
commitbe242d576c4457bec1cb748b144eb287e98ac0b5
treeb580a39797889f79ca34f7c230786c1dbe51c26etree | snapshot
parent60fa08ed617dd148a9843bfdef2dfecf2ef60123commit | diff
git-merge: warn when -m provided on a fast forward

Warn the user that the "-m" option is ignored in the case of a fast
forward.  That may save some confusion in the case where the user
doesn't know about fast forwards yet and may not realize that the
behavior here is intentional.

Signed-off-by: "J. Bruce Fields" <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-merge.sh diff | blob | history
git clone https://git.99rst.org/PROJECT