projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 52a3e01) | patch
Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013...
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2013 20:10:27 +0000 (13:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2013 20:10:27 +0000 (13:10 -0700)
commit0290bf1250533442aa870d303e56745388d562c2
tree7c0edf4d8f27084c1cb0b6d2511d0e6d95b370bftree | snapshot
parent52a3e011c779456e63b6274af0024eeb92dd7888commit | diff
Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013-01-17)

Kevin Bracey reports that the change regresses a case shown in the
user manual.

Trading one fix with another breakage is not worth it.  Just keep
the test to document the existing breakage, and revert the change
for now.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
revision.c diff | blob | blame | history
t/t6012-rev-list-simplify.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.