projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ebdf7b9) | patch
git-merge: fix "fix confusion between tag and branch" for real
authorJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 19:22:55 +0000 (11:22 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 19:22:55 +0000 (11:22 -0800)
commitde51faf3888505fa3d661d4c35f32ecaf9fa1087
treedb4405db0a144e38ced9de7880746f55d6658701tree | snapshot
parentebdf7b952215946eff863e4da28f924178acea4fcommit | diff
git-merge: fix "fix confusion between tag and branch" for real

An earlier commit 3683dc5a broke the merge message generation with
a careless use of && where it was not needed, breaking the merge
message for cases where non branches are given.

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