summaryrefslogtreecommitdiff
path: root/diffcore-rename.c
diff options
context:
space:
mode:
authorLibravatar J. Bruce Fields <bfields@fieldses.org>2007-03-11 12:28:56 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-11 23:49:20 -0700
commitbe242d576c4457bec1cb748b144eb287e98ac0b5 (patch)
treeb580a39797889f79ca34f7c230786c1dbe51c26e /diffcore-rename.c
parentgit.el: Retrieve commit log information from .dotest directory. (diff)
downloadtgif-be242d576c4457bec1cb748b144eb287e98ac0b5.tar.xz
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>
Diffstat (limited to 'diffcore-rename.c')
0 files changed, 0 insertions, 0 deletions