diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-08 13:10:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-08 13:10:27 -0700 |
| commit | 0290bf1250533442aa870d303e56745388d562c2 (patch) | |
| tree | 7c0edf4d8f27084c1cb0b6d2511d0e6d95b370bf /contrib/subtree/git-subtree.sh | |
| parent | Sync with 1.8.2.1 (diff) | |
| download | tgif-0290bf1250533442aa870d303e56745388d562c2.tar.xz | |
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>
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
0 files changed, 0 insertions, 0 deletions