summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-241-3/+12
* rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-211-2/+1
* Merge branch 'sh/rebase-i-p'Junio C Hamano2008-11-021-49/+83
|\
| * git-rebase--interactive.sh: comparision with == is bashismJunio C Hamano2008-10-221-1/+1
| * rebase-i-p: minimum fix to obvious issuesJunio C Hamano2008-10-201-3/+4
| * rebase-i-p: if todo was reordered use HEAD as the rewritten parentStephen Haberman2008-10-161-0/+9
| * rebase-i-p: do not include non-first-parent commits touching UPSTREAMStephen Haberman2008-10-161-1/+2
| * rebase-i-p: only list commits that require rewriting in todoStephen Haberman2008-10-161-25/+52
| * rebase-i-p: fix 'no squashing merges' tripping up non-mergesStephen Haberman2008-10-161-5/+9
| * rebase-i-p: delay saving current-commit to REWRITTEN if squashingStephen Haberman2008-10-161-5/+10
| * rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEADStephen Haberman2008-10-161-14/+1
* | Merge branch 'sh/maint-rebase3'Junio C Hamano2008-10-191-2/+35
|\ \ | |/
| * rebase--interactive: fix parent rewriting for dropped commitsStephen Haberman2008-10-161-2/+35
* | Merge branch 'ns/rebase-noverify'Junio C Hamano2008-10-191-1/+9
|\ \ | |/ |/|
| * rebase --no-verifyNanako Shiraishi2008-10-061-1/+9
* | rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin2008-10-101-1/+2
* | Merge branch 'sg/maint-intrebase-msghook' into maintShawn O. Pearce2008-10-091-6/+11
|\ \ | |/ |/|
| * rebase -i: remove leftover debuggingSZEDER Gábor2008-10-031-1/+1
| * rebase -i: proper prepare-commit-msg hook argument when squashingSZEDER Gábor2008-10-021-6/+11
* | Teach rebase -i to honor pre-rebase hookNanako Shiraishi2008-10-061-0/+11
|/
* git-rebase--interactive: auto amend only edited commitDmitry Potapov2008-09-091-1/+5
* git-rebase-interactive: do not squash commits on abortDmitry Potapov2008-09-091-2/+6
* rebase -i -p: fix parent rewritingThomas Rast2008-08-131-4/+2
* rebase -i -p: handle index and workdir correctlyThomas Rast2008-08-131-2/+12
* rebase -i: When an 'edit' stops, mention the commitJohannes Sixt2008-07-231-1/+1
* Merge branch 'maint'Junio C Hamano2008-07-161-0/+2
|\
| * rebase-i: keep old parents when preserving mergesStephan Beyer2008-07-161-0/+2
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-151-1/+1
* | Merge branch 'jc/rebase-orig-head'Junio C Hamano2008-07-141-0/+1
|\ \
| * | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-071-0/+1
| |/
* | Make rebase--interactive use OPTIONS_SPECStephan Beyer2008-07-131-26/+51
|/
* git-rebase -i: mention the short command aliases in the todo listMiklos Vajna2008-06-081-3/+3
* rebase --interactive: Compute upstream SHA1 before switching branchesJohannes Sixt2008-06-021-4/+3
* Ignore dirty submodule states during rebase and stashJohannes Schindelin2008-05-151-5/+6
* remove use of "tail -n 1" and "tail -1"Jeff King2008-03-131-1/+1
* grep portability fix: don't use "-e" or "-q"Jeff King2008-03-131-3/+3
* Prompt to continue when editing during rebase --interactiveJonathan del Strother2008-02-271-0/+4
* rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig2008-02-111-1/+1
* Squelch bogus progress output from git-rebase--interactiveJunio C Hamano2008-01-141-2/+7
* git-rebase -i: clean-up error check codepath.Junio C Hamano2007-12-301-10/+19
* git-rebase -i behaves better on commits with incomplete messagesJunio C Hamano2007-12-301-2/+4
* Reallow git-rebase --interactive --continue if commit is unnecessaryShawn O. Pearce2007-12-201-1/+3
* Catch and handle git-commit failures in git-rebase --interactiveShawn O. Pearce2007-12-191-8/+9
* Avoid update hook during git-rebase --interactiveShawn O. Pearce2007-12-191-2/+2
* Fix interactive rebase to preserve author email addressSean2007-12-191-1/+1
* rebase -p -i: handle "no changes" gracefullyJohannes Schindelin2007-12-171-1/+6
* Merge branch 'js/rebase-i-rerere'Junio C Hamano2007-12-021-1/+4
|\
| * rebase -i: give rerere a chanceJohannes Schindelin2007-11-281-1/+4
* | revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta2007-11-301-0/+5
|/
* Merge branch 'maint'Junio C Hamano2007-11-281-2/+2
|\
View Lorry Controller Status