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