Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rebase -i -p: leave a --cc patch when a merge could not be redone | Johannes Schindelin | 2008-12-24 | 1 | -0/+1 |
* | rebase -i -p: Fix --continue after a merge could not be redone | Johannes Sixt | 2008-12-21 | 1 | -1/+1 |
* | Show a failure of rebase -p if the merge had a conflict | Johannes Sixt | 2008-12-21 | 1 | -11/+44 |
* | rebase: Support preserving merges in non-interactive mode | Andreas Ericsson | 2008-09-30 | 1 | -0/+61 |