projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f5b49ea) | patch
rebase -i -p: leave a --cc patch when a merge could not be redone
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Mon, 22 Dec 2008 21:16:51 +0000 (22:16 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Dec 2008 08:14:08 +0000 (00:14 -0800)
commit4fb1a19d502f4a2ca47bfb75cce605f3447819e6
tree0a7fe923328aa0011f7651e9d32b20926b52e590tree | snapshot
parentf5b49ea6191c2d631d1d70305b25d5db3bf05c92commit | diff
rebase -i -p: leave a --cc patch when a merge could not be redone

The result is easier to review this way, and the merge resolution has to be
done inside the work tree, not by adjusting "the patch" anyway.
git-rebase--interactive.sh diff | blob | history
t/t3409-rebase-preserve-merges.sh diff | blob | history
Git—the stupid content tracker