![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 14 Dec 2005 01:01:23 +0000 (17:01 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 14 Dec 2005 01:01:23 +0000 (17:01 -0800) | ||
| commit | 9954f5b876abb6118f9bdf1d113239d86acca7bd | |
| tree | 50edc92b146245437339503752285b3120605b0e | tree | snapshot |
| parent | 0a8b4def9ae9e929a3310b536782a80a7c7644e7 | commit | diff |
[PATCH] allow merging any committish
Although "git-merge" is advertised as the end-user level command
(instead of being a "git-pull" backend), it was not prepared to
take tag objects that point at commits and barfed when fed one.
Sanitize the input while we validate them, for which we already
have a loop.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Although "git-merge" is advertised as the end-user level command
(instead of being a "git-pull" backend), it was not prepared to
take tag objects that point at commits and barfed when fed one.
Sanitize the input while we validate them, for which we already
have a loop.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diff | blob | history |