| commit | be242d576c4457bec1cb748b144eb287e98ac0b5 | |
| author | J. Bruce Fields <bfields@fieldses.org> | |
| Sun, 11 Mar 2007 16:28:56 +0000 (11 12:28 -0400) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 12 Mar 2007 06:49:20 +0000 (11 23:49 -0700) | ||
| tree | b580a39797889f79ca34f7c230786c1dbe51c26e | treesnapshot (tar.gz zip) |
| parent | 60fa08ed617dd148a9843bfdef2dfecf2ef60123 | commitdiff |
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" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diffblobblamehistory |