summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)Author
2010-01-12rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty
2009-12-20Merge branch 'maint'Junio C Hamano
2009-12-20rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson
2009-12-03Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano
2009-11-24Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano
2009-11-16Merge branch 'fc/doc-fast-forward'Junio C Hamano
2009-10-28Merge branch 'maint'Junio C Hamano
2009-10-28rebase -i: more graceful handling of invalid commandsJan Krüger
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2009-10-19rebase -i: fix reword when using a terminal editorStephen Boyd
2009-10-08Teach 'rebase -i' the command "reword"Björn Gustavsson
2009-07-22Fix rebase -p --ontoGreg Price
2009-06-11Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maintJunio C Hamano
2009-06-11rebase--interactive: remote stray closing parenthesisUwe Kleine-König
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