projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 33ebb87) | patch
rebase: get rid of outdated MRESOLVEMSG
authorEric Wong <normalperson@yhbt.net>
Wed, 28 Jun 2006 09:11:06 +0000 (02:11 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 28 Jun 2006 10:20:51 +0000 (03:20 -0700)
commit66eb64cba64a26dbf2b1d4e319d6514696154fee
treed38739ca87e2a0bc12e1c2ff09aaf83b6762079ctree | snapshot
parent33ebb8717f15a85615f712df125c37737062e1b2commit | diff
rebase: get rid of outdated MRESOLVEMSG

There was a time when rebase --skip didn't work when used with
--merge, but that is no more so we don't need that message
anymore.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh diff | blob | history
Git—the stupid content tracker