summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-26 23:09:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-26 23:38:21 (GMT)
commit7f9acb2a16473e5ba6d44231d2fc844ca8bb9817 (patch)
tree33eae8481b9bd01b2fdf741b801c497cc29443c9 /contrib/emacs
parent8ac65937d032ad3e4bda1d7d6a8b924a65a01fb4 (diff)
downloadgit-7f9acb2a16473e5ba6d44231d2fc844ca8bb9817.zip
git-7f9acb2a16473e5ba6d44231d2fc844ca8bb9817.tar.gz
git-7f9acb2a16473e5ba6d44231d2fc844ca8bb9817.tar.bz2
git-merge: leave sensible reflog message when used as the first level UI.
It used to throw potentially multi-line log message at reflog. Just record the heads that were given to be merged at the command line and the action. Revert the removal of the check in "git-update-ref -m" I made earlier which was only a work-around for this. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/emacs')
0 files changed, 0 insertions, 0 deletions