summaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorLines
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-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
2007-12-20Reallow git-rebase --interactive --continue if commit is unnecessaryShawn O. Pearce-1/+3
2007-12-19Catch and handle git-commit failures in git-rebase --interactiveShawn O. Pearce-8/+9
2007-12-19Avoid update hook during git-rebase --interactiveShawn O. Pearce-2/+2
2007-12-19Fix interactive rebase to preserve author email addressSean-1/+1
2007-12-17rebase -p -i: handle "no changes" gracefullyJohannes Schindelin-1/+6
2007-12-02Merge branch 'js/rebase-i-rerere'Junio C Hamano-1/+4
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta-0/+5
2007-11-28rebase -i: give rerere a chanceJohannes Schindelin-1/+4
2007-11-28Merge branch 'maint'Junio C Hamano-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeJunio C Hamano-2/+2
2007-11-22rebase -i: move help to end of todo fileJohannes Schindelin-6/+8
2007-11-17Merge branch 'ph/parseopt-sh'Junio C Hamano-0/+1
2007-11-09Merge branch 'maint'Junio C Hamano-1/+1
2007-11-08Avoid a few unportable, needlessly nested "...`...".Ralf Wildenhues-1/+1
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano-0/+1
2007-10-30Merge branch 'maint' into HEADJunio C Hamano-3/+4
2007-10-30git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink-0/+2
2007-10-30git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink-2/+2
2007-10-30Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink-1/+0
2007-10-16git-rebase--interactive.sh: Quote arguments to testMichael W. Olson-1/+1
2007-10-15Merge branch 'maint'Shawn O. Pearce-2/+2
2007-10-15rebase -i: use diff plumbing instead of porcelainJohannes Schindelin-2/+2
2007-10-03Merge branch 'js/rebase-i'Junio C Hamano-8/+15
2007-10-03Merge branch 'jc/autogc'Junio C Hamano-0/+2