aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAge
* Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano2009-01-31
|\
| * Fix submodule squashing into unrelated commitJohannes Schindelin2009-01-28
* | rebase -i: correctly remember --root flag across --continueJunio C Hamano2009-01-26
* | rebase -i --root: fix check for number of argumentsJohannes Schindelin2009-01-25
* | Merge branch 'tr/rebase-root'Junio C Hamano2009-01-17
|\ \ | |/ |/|
| * rebase -i: learn to rebase root commitThomas Rast2009-01-11
| * rebase -i: execute hook only after argument checkingThomas Rast2009-01-03
* | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-13
|\ \ | |/ |/|
| * Avoid spurious error messages on error mistakes.Pierre Habouzit2009-01-13
* | rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-24
* | rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-21
* | Merge branch 'sh/rebase-i-p'Junio C Hamano2008-11-02
|\ \
| * | git-rebase--interactive.sh: comparision with == is bashismJunio C Hamano2008-10-22
| * | rebase-i-p: minimum fix to obvious issuesJunio C Hamano2008-10-20
| * | rebase-i-p: if todo was reordered use HEAD as the rewritten parentStephen Haberman2008-10-16
| * | rebase-i-p: do not include non-first-parent commits touching UPSTREAMStephen Haberman2008-10-16
| * | rebase-i-p: only list commits that require rewriting in todoStephen Haberman2008-10-16
| * | rebase-i-p: fix 'no squashing merges' tripping up non-mergesStephen Haberman2008-10-16
| * | rebase-i-p: delay saving current-commit to REWRITTEN if squashingStephen Haberman2008-10-16
| * | rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEADStephen Haberman2008-10-16
* | | Merge branch 'sh/maint-rebase3'Junio C Hamano2008-10-19
|\ \ \ | |/ /
| * | rebase--interactive: fix parent rewriting for dropped commitsStephen Haberman2008-10-16
| |/
* | Merge branch 'ns/rebase-noverify'Junio C Hamano2008-10-19
|\ \ | |/ |/|
| * rebase --no-verifyNanako Shiraishi2008-10-06
* | rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin2008-10-10
* | Merge branch 'sg/maint-intrebase-msghook' into maintShawn O. Pearce2008-10-09
|\ \ | |/ |/|
| * rebase -i: remove leftover debuggingSZEDER Gábor2008-10-03
| * rebase -i: proper prepare-commit-msg hook argument when squashingSZEDER Gábor2008-10-02
* | Teach rebase -i to honor pre-rebase hookNanako Shiraishi2008-10-06
|/
* git-rebase--interactive: auto amend only edited commitDmitry Potapov2008-09-09
* git-rebase-interactive: do not squash commits on abortDmitry Potapov2008-09-09
* rebase -i -p: fix parent rewritingThomas Rast2008-08-13
* rebase -i -p: handle index and workdir correctlyThomas Rast2008-08-13
* rebase -i: When an 'edit' stops, mention the commitJohannes Sixt2008-07-23
* Merge branch 'maint'Junio C Hamano2008-07-16
|\
| * rebase-i: keep old parents when preserving mergesStephan Beyer2008-07-16
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-15
* | Merge branch 'jc/rebase-orig-head'Junio C Hamano2008-07-14
|\ \
| * | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-07
| |/
* | Make rebase--interactive use OPTIONS_SPECStephan Beyer2008-07-13
|/
* git-rebase -i: mention the short command aliases in the todo listMiklos Vajna2008-06-08
* rebase --interactive: Compute upstream SHA1 before switching branchesJohannes Sixt2008-06-02
* Ignore dirty submodule states during rebase and stashJohannes Schindelin2008-05-15
* remove use of "tail -n 1" and "tail -1"Jeff King2008-03-13
* grep portability fix: don't use "-e" or "-q"Jeff King2008-03-13
* Prompt to continue when editing during rebase --interactiveJonathan del Strother2008-02-27
* rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig2008-02-11
* Squelch bogus progress output from git-rebase--interactiveJunio C Hamano2008-01-14
* git-rebase -i: clean-up error check codepath.Junio C Hamano2007-12-30
* git-rebase -i behaves better on commits with incomplete messagesJunio C Hamano2007-12-30
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 23:17:31 +0000