diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-12-22 22:16:51 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-12-24 00:14:08 -0800 |
| commit | 4fb1a19d502f4a2ca47bfb75cce605f3447819e6 (patch) | |
| tree | 0a7fe923328aa0011f7651e9d32b20926b52e590 /diff-no-index.c | |
| parent | rebase -i -p: Fix --continue after a merge could not be redone (diff) | |
| download | tgif-4fb1a19d502f4a2ca47bfb75cce605f3447819e6.tar.xz | |
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.
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions