summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)Author
2009-03-03rebase -i: avoid 'git reset' when possibleJohannes Schindelin
2009-02-01Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano
2009-01-28Fix submodule squashing into unrelated commitJohannes Schindelin
2009-01-27rebase -i: correctly remember --root flag across --continueJunio C Hamano
2009-01-26rebase -i --root: fix check for number of argumentsJohannes Schindelin
2009-01-18Merge branch 'tr/rebase-root'Junio C Hamano
2009-01-13Merge branch 'maint-1.6.0' into maintJunio C Hamano
2009-01-13Avoid spurious error messages on error mistakes.Pierre Habouzit
2009-01-12rebase -i: learn to rebase root commitThomas Rast
2009-01-03rebase -i: execute hook only after argument checkingThomas Rast
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt
2008-11-03Merge branch 'sh/rebase-i-p'Junio C Hamano
2008-10-22git-rebase--interactive.sh: comparision with == is bashismJunio C Hamano
2008-10-21rebase-i-p: minimum fix to obvious issuesJunio C Hamano
2008-10-19Merge branch 'sh/maint-rebase3'Junio C Hamano
2008-10-19Merge branch 'ns/rebase-noverify'Junio C Hamano
2008-10-16rebase-i-p: if todo was reordered use HEAD as the rewritten parentStephen Haberman
2008-10-16rebase-i-p: do not include non-first-parent commits touching UPSTREAMStephen Haberman
2008-10-16rebase-i-p: only list commits that require rewriting in todoStephen Haberman
2008-10-16rebase-i-p: fix 'no squashing merges' tripping up non-mergesStephen Haberman
2008-10-16rebase-i-p: delay saving current-commit to REWRITTEN if squashingStephen Haberman
2008-10-16rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEADStephen Haberman
2008-10-16rebase--interactive: fix parent rewriting for dropped commitsStephen Haberman
2008-10-10rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin
2008-10-09Merge branch 'sg/maint-intrebase-msghook' into maintShawn O. Pearce
2008-10-06rebase --no-verifyNanako Shiraishi
2008-10-06Teach rebase -i to honor pre-rebase hookNanako Shiraishi
2008-10-03rebase -i: remove leftover debuggingSZEDER Gábor
2008-10-03rebase -i: proper prepare-commit-msg hook argument when squashingSZEDER Gábor
2008-09-09git-rebase--interactive: auto amend only edited commitDmitry Potapov
2008-09-09git-rebase-interactive: do not squash commits on abortDmitry Potapov
2008-08-13rebase -i -p: fix parent rewritingThomas Rast
2008-08-13rebase -i -p: handle index and workdir correctlyThomas Rast
2008-07-23rebase -i: When an 'edit' stops, mention the commitJohannes Sixt
2008-07-17Merge branch 'maint'Junio C Hamano
2008-07-16rebase-i: keep old parents when preserving mergesStephan Beyer
2008-07-16Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin
2008-07-15Merge branch 'jc/rebase-orig-head'Junio C Hamano
2008-07-13Make rebase--interactive use OPTIONS_SPECStephan Beyer
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano
2008-06-08git-rebase -i: mention the short command aliases in the todo listMiklos Vajna
2008-06-03rebase --interactive: Compute upstream SHA1 before switching branchesJohannes Sixt
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King
2008-03-13grep portability fix: don't use "-e" or "-q"Jeff King
2008-02-27Prompt to continue when editing during rebase --interactiveJonathan del Strother
2008-02-11rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig
2008-01-15Squelch bogus progress output from git-rebase--interactiveJunio C Hamano
2007-12-30git-rebase -i: clean-up error check codepath.Junio C Hamano