| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint | Junio C Hamano | 2009-06-11 | 1 | -1/+1 |
|\ |
|
| * | rebase--interactive: remote stray closing parenthesis | Uwe Kleine-König | 2009-06-11 | 1 | -1/+1 |
* | | rebase -i: avoid 'git reset' when possible | Johannes Schindelin | 2009-03-03 | 1 | -0/+26 |
* | | Merge branch 'js/maint-rebase-i-submodule' | Junio C Hamano | 2009-01-31 | 1 | -5/+4 |
|\ \ |
|
| * | | Fix submodule squashing into unrelated commit | Johannes Schindelin | 2009-01-28 | 1 | -5/+4 |
* | | | rebase -i: correctly remember --root flag across --continue | Junio C Hamano | 2009-01-26 | 1 | -2/+8 |
* | | | rebase -i --root: fix check for number of arguments | Johannes Schindelin | 2009-01-25 | 1 | -1/+2 |
* | | | Merge branch 'tr/rebase-root' | Junio C Hamano | 2009-01-17 | 1 | -31/+79 |
|\ \ \
| |/ /
|/| | |
|
| * | | rebase -i: learn to rebase root commit | Thomas Rast | 2009-01-11 | 1 | -31/+78 |
| * | | rebase -i: execute hook only after argument checking | Thomas Rast | 2009-01-03 | 1 | -2/+3 |
* | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-13 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Avoid spurious error messages on error mistakes. | Pierre Habouzit | 2009-01-13 | 1 | -1/+1 |
* | | | rebase -i -p: leave a --cc patch when a merge could not be redone | Johannes Schindelin | 2008-12-24 | 1 | -3/+12 |
* | | | rebase -i -p: Fix --continue after a merge could not be redone | Johannes Sixt | 2008-12-21 | 1 | -2/+1 |
* | | | Merge branch 'sh/rebase-i-p' | Junio C Hamano | 2008-11-02 | 1 | -49/+83 |
|\ \ \ |
|
| * | | | git-rebase--interactive.sh: comparision with == is bashism | Junio C Hamano | 2008-10-22 | 1 | -1/+1 |
| * | | | rebase-i-p: minimum fix to obvious issues | Junio C Hamano | 2008-10-20 | 1 | -3/+4 |
| * | | | rebase-i-p: if todo was reordered use HEAD as the rewritten parent | Stephen Haberman | 2008-10-16 | 1 | -0/+9 |
| * | | | rebase-i-p: do not include non-first-parent commits touching UPSTREAM | Stephen Haberman | 2008-10-16 | 1 | -1/+2 |
| * | | | rebase-i-p: only list commits that require rewriting in todo | Stephen Haberman | 2008-10-16 | 1 | -25/+52 |
| * | | | rebase-i-p: fix 'no squashing merges' tripping up non-merges | Stephen Haberman | 2008-10-16 | 1 | -5/+9 |
| * | | | rebase-i-p: delay saving current-commit to REWRITTEN if squashing | Stephen Haberman | 2008-10-16 | 1 | -5/+10 |
| * | | | rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD | Stephen Haberman | 2008-10-16 | 1 | -14/+1 |
* | | | | Merge branch 'sh/maint-rebase3' | Junio C Hamano | 2008-10-19 | 1 | -2/+35 |
|\ \ \ \
| |/ / / |
|
| * | | | rebase--interactive: fix parent rewriting for dropped commits | Stephen Haberman | 2008-10-16 | 1 | -2/+35 |
| |/ / |
|
* | | | Merge branch 'ns/rebase-noverify' | Junio C Hamano | 2008-10-19 | 1 | -1/+9 |
|\ \ \
| |/ /
|/| | |
|
| * | | rebase --no-verify | Nanako Shiraishi | 2008-10-06 | 1 | -1/+9 |
* | | | rebase -i: do not fail when there is no commit to cherry-pick | Johannes Schindelin | 2008-10-10 | 1 | -1/+2 |
* | | | Merge branch 'sg/maint-intrebase-msghook' into maint | Shawn O. Pearce | 2008-10-09 | 1 | -6/+11 |
|\ \ \
| |/ /
|/| | |
|
| * | | rebase -i: remove leftover debugging | SZEDER Gábor | 2008-10-03 | 1 | -1/+1 |
| * | | rebase -i: proper prepare-commit-msg hook argument when squashing | SZEDER Gábor | 2008-10-02 | 1 | -6/+11 |
* | | | Teach rebase -i to honor pre-rebase hook | Nanako Shiraishi | 2008-10-06 | 1 | -0/+11 |
|/ / |
|
* | | git-rebase--interactive: auto amend only edited commit | Dmitry Potapov | 2008-09-09 | 1 | -1/+5 |
* | | git-rebase-interactive: do not squash commits on abort | Dmitry Potapov | 2008-09-09 | 1 | -2/+6 |
* | | rebase -i -p: fix parent rewriting | Thomas Rast | 2008-08-13 | 1 | -4/+2 |
* | | rebase -i -p: handle index and workdir correctly | Thomas Rast | 2008-08-13 | 1 | -2/+12 |
* | | rebase -i: When an 'edit' stops, mention the commit | Johannes Sixt | 2008-07-23 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-07-16 | 1 | -0/+2 |
|\ \ |
|
| * | | rebase-i: keep old parents when preserving merges | Stephan Beyer | 2008-07-16 | 1 | -0/+2 |
* | | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 | 1 | -1/+1 |
* | | | Merge branch 'jc/rebase-orig-head' | Junio C Hamano | 2008-07-14 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Teach "am" and "rebase" to mark the original position with ORIG_HEAD | Junio C Hamano | 2008-07-07 | 1 | -0/+1 |
| |/ / |
|
* | | | Make rebase--interactive use OPTIONS_SPEC | Stephan Beyer | 2008-07-13 | 1 | -26/+51 |
|/ / |
|
* | | git-rebase -i: mention the short command aliases in the todo list | Miklos Vajna | 2008-06-08 | 1 | -3/+3 |
* | | rebase --interactive: Compute upstream SHA1 before switching branches | Johannes Sixt | 2008-06-02 | 1 | -4/+3 |
* | | Ignore dirty submodule states during rebase and stash | Johannes Schindelin | 2008-05-15 | 1 | -5/+6 |
* | | remove use of "tail -n 1" and "tail -1" | Jeff King | 2008-03-13 | 1 | -1/+1 |
* | | grep portability fix: don't use "-e" or "-q" | Jeff King | 2008-03-13 | 1 | -3/+3 |
* | | Prompt to continue when editing during rebase --interactive | Jonathan del Strother | 2008-02-27 | 1 | -0/+4 |
* | | rebase -i: accept -m as advertised in the man page | Uwe Kleine-K,Av(Bnig | 2008-02-11 | 1 | -1/+1 |