projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8ac6593) | patch
git-merge: leave sensible reflog message when used as the first level UI.
authorJunio C Hamano <junkio@cox.net>
Fri, 26 Jan 2007 23:09:02 +0000 (15:09 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 26 Jan 2007 23:38:21 +0000 (15:38 -0800)
commit7f9acb2a16473e5ba6d44231d2fc844ca8bb9817
tree33eae8481b9bd01b2fdf741b801c497cc29443c9tree | snapshot
parent8ac65937d032ad3e4bda1d7d6a8b924a65a01fb4commit | diff
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>
builtin-update-ref.c diff | blob | history
git-merge.sh diff | blob | history
Git—the stupid content tracker