summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)Author
2008-07-17Merge branch 'maint'Junio C Hamano
2008-07-16rebase-i: keep old parents when preserving mergesStephan Beyer
2008-07-16Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin
2008-07-15Merge branch 'jc/rebase-orig-head'Junio C Hamano
2008-07-13Make rebase--interactive use OPTIONS_SPECStephan Beyer
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano
2008-06-08git-rebase -i: mention the short command aliases in the todo listMiklos Vajna
2008-06-03rebase --interactive: Compute upstream SHA1 before switching branchesJohannes Sixt
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King
2008-03-13grep portability fix: don't use "-e" or "-q"Jeff King
2008-02-27Prompt to continue when editing during rebase --interactiveJonathan del Strother
2008-02-11rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig
2008-01-15Squelch bogus progress output from git-rebase--interactiveJunio C Hamano
2007-12-30git-rebase -i: clean-up error check codepath.Junio C Hamano
2007-12-30git-rebase -i behaves better on commits with incomplete messagesJunio C Hamano
2007-12-20Reallow git-rebase --interactive --continue if commit is unnecessaryShawn O. Pearce
2007-12-20Catch and handle git-commit failures in git-rebase --interactiveShawn O. Pearce
2007-12-20Avoid update hook during git-rebase --interactiveShawn O. Pearce
2007-12-19Fix interactive rebase to preserve author email addressSean
2007-12-18rebase -p -i: handle "no changes" gracefullyJohannes Schindelin
2007-12-03Merge branch 'js/rebase-i-rerere'Junio C Hamano
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta
2007-11-29rebase -i: give rerere a chanceJohannes Schindelin
2007-11-29Merge branch 'maint'Junio C Hamano
2007-11-29scripts: do not get confused with HEAD in work treeJunio C Hamano
2007-11-22rebase -i: move help to end of todo fileJohannes Schindelin
2007-11-18Merge branch 'ph/parseopt-sh'Junio C Hamano
2007-11-09Merge branch 'maint'Junio C Hamano
2007-11-08Avoid a few unportable, needlessly nested "...`...".Ralf Wildenhues
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano
2007-10-31Merge branch 'maint' into HEADJunio C Hamano
2007-10-31git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink
2007-10-31git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink
2007-10-31Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink
2007-10-16git-rebase--interactive.sh: Quote arguments to testMichael W. Olson
2007-10-16Merge branch 'maint'Shawn O. Pearce
2007-10-16rebase -i: use diff plumbing instead of porcelainJohannes Schindelin
2007-10-03Merge branch 'js/rebase-i'Junio C Hamano
2007-10-03Merge branch 'jc/autogc'Junio C Hamano
2007-09-30Merge branch 'maint'Junio C Hamano
2007-09-30rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin
2007-09-30rebase -i: support single-letter abbreviations for the actionsJohannes Schindelin
2007-09-26rebase -i: work on a detached HEADJohannes Schindelin
2007-09-26Merge branch 'jc/autogc' into js/rebase-iJunio C Hamano
2007-09-26rebase -i: create .dotest-merge after validating options.Matt Kraai
2007-09-26rebase -i: avoid exporting GIT_AUTHOR_* variablesJohannes Schindelin
2007-09-26rebase -i: Fix numbers in progress reportJohannes Schindelin
2007-09-26rebase -i: style fixes and minor cleanupsJohannes Schindelin
2007-09-26rebase -i: commit when continuing after "edit"Johannes Schindelin