summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin1-3/+12
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt1-2/+1
2008-11-02Merge branch 'sh/rebase-i-p'Junio C Hamano1-49/+83
2008-10-22git-rebase--interactive.sh: comparision with == is bashismJunio C Hamano1-1/+1
2008-10-20rebase-i-p: minimum fix to obvious issuesJunio C Hamano1-3/+4
2008-10-19Merge branch 'sh/maint-rebase3'Junio C Hamano1-2/+35
2008-10-19Merge branch 'ns/rebase-noverify'Junio C Hamano1-1/+9
2008-10-16rebase-i-p: if todo was reordered use HEAD as the rewritten parentStephen Haberman1-0/+9
2008-10-16rebase-i-p: do not include non-first-parent commits touching UPSTREAMStephen Haberman1-1/+2
2008-10-16rebase-i-p: only list commits that require rewriting in todoStephen Haberman1-25/+52
2008-10-16rebase-i-p: fix 'no squashing merges' tripping up non-mergesStephen Haberman1-5/+9
2008-10-16rebase-i-p: delay saving current-commit to REWRITTEN if squashingStephen Haberman1-5/+10
2008-10-16rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEADStephen Haberman1-14/+1
2008-10-16rebase--interactive: fix parent rewriting for dropped commitsStephen Haberman1-2/+35
2008-10-10rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin1-1/+2
2008-10-09Merge branch 'sg/maint-intrebase-msghook' into maintShawn O. Pearce1-6/+11
2008-10-06rebase --no-verifyNanako Shiraishi1-1/+9
2008-10-06Teach rebase -i to honor pre-rebase hookNanako Shiraishi1-0/+11
2008-10-03rebase -i: remove leftover debuggingSZEDER Gábor1-1/+1
2008-10-02rebase -i: proper prepare-commit-msg hook argument when squashingSZEDER Gábor1-6/+11
2008-09-09git-rebase--interactive: auto amend only edited commitDmitry Potapov1-1/+5
2008-09-09git-rebase-interactive: do not squash commits on abortDmitry Potapov1-2/+6
2008-08-13rebase -i -p: fix parent rewritingThomas Rast1-4/+2
2008-08-13rebase -i -p: handle index and workdir correctlyThomas Rast1-2/+12
2008-07-23rebase -i: When an 'edit' stops, mention the commitJohannes Sixt1-1/+1
2008-07-16Merge branch 'maint'Junio C Hamano1-0/+2
2008-07-16rebase-i: keep old parents when preserving mergesStephan Beyer1-0/+2
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin1-1/+1
2008-07-14Merge branch 'jc/rebase-orig-head'Junio C Hamano1-0/+1
2008-07-13Make rebase--interactive use OPTIONS_SPECStephan Beyer1-26/+51
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano1-0/+1
2008-06-08git-rebase -i: mention the short command aliases in the todo listMiklos Vajna1-3/+3
2008-06-02rebase --interactive: Compute upstream SHA1 before switching branchesJohannes Sixt1-4/+3
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin1-5/+6
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King1-1/+1
2008-03-13grep portability fix: don't use "-e" or "-q"Jeff King1-3/+3
2008-02-27Prompt to continue when editing during rebase --interactiveJonathan del Strother1-0/+4
2008-02-11rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig1-1/+1
2008-01-14Squelch bogus progress output from git-rebase--interactiveJunio C Hamano1-2/+7
2007-12-30git-rebase -i: clean-up error check codepath.Junio C Hamano1-10/+19
2007-12-30git-rebase -i behaves better on commits with incomplete messagesJunio C Hamano1-2/+4
2007-12-20Reallow git-rebase --interactive --continue if commit is unnecessaryShawn O. Pearce1-1/+3
2007-12-19Catch and handle git-commit failures in git-rebase --interactiveShawn O. Pearce1-8/+9
2007-12-19Avoid update hook during git-rebase --interactiveShawn O. Pearce1-2/+2
2007-12-19Fix interactive rebase to preserve author email addressSean1-1/+1
2007-12-17rebase -p -i: handle "no changes" gracefullyJohannes Schindelin1-1/+6
2007-12-02Merge branch 'js/rebase-i-rerere'Junio C Hamano1-1/+4
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta1-0/+5
2007-11-28rebase -i: give rerere a chanceJohannes Schindelin1-1/+4
2007-11-28Merge branch 'maint'Junio C Hamano1-2/+2