summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2008-08-13rebase -i -p: fix parent rewritingLibravatar Thomas Rast1-4/+2
2008-08-13rebase -i -p: handle index and workdir correctlyLibravatar Thomas Rast1-2/+12
2008-07-23rebase -i: When an 'edit' stops, mention the commitLibravatar Johannes Sixt1-1/+1
2008-07-16Merge branch 'maint'Libravatar Junio C Hamano1-0/+2
2008-07-16rebase-i: keep old parents when preserving mergesLibravatar Stephan Beyer1-0/+2
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Libravatar Johannes Schindelin1-1/+1
2008-07-14Merge branch 'jc/rebase-orig-head'Libravatar Junio C Hamano1-0/+1
2008-07-13Make rebase--interactive use OPTIONS_SPECLibravatar Stephan Beyer1-26/+51
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADLibravatar Junio C Hamano1-0/+1
2008-06-08git-rebase -i: mention the short command aliases in the todo listLibravatar Miklos Vajna1-3/+3
2008-06-02rebase --interactive: Compute upstream SHA1 before switching branchesLibravatar Johannes Sixt1-4/+3
2008-05-15Ignore dirty submodule states during rebase and stashLibravatar Johannes Schindelin1-5/+6
2008-03-13remove use of "tail -n 1" and "tail -1"Libravatar Jeff King1-1/+1
2008-03-13grep portability fix: don't use "-e" or "-q"Libravatar Jeff King1-3/+3
2008-02-27Prompt to continue when editing during rebase --interactiveLibravatar Jonathan del Strother1-0/+4
2008-02-11rebase -i: accept -m as advertised in the man pageLibravatar Uwe Kleine-K,Av(Bnig1-1/+1
2008-01-14Squelch bogus progress output from git-rebase--interactiveLibravatar Junio C Hamano1-2/+7
2007-12-30git-rebase -i: clean-up error check codepath.Libravatar Junio C Hamano1-10/+19
2007-12-30git-rebase -i behaves better on commits with incomplete messagesLibravatar Junio C Hamano1-2/+4
2007-12-20Reallow git-rebase --interactive --continue if commit is unnecessaryLibravatar Shawn O. Pearce1-1/+3
2007-12-19Catch and handle git-commit failures in git-rebase --interactiveLibravatar Shawn O. Pearce1-8/+9
2007-12-19Avoid update hook during git-rebase --interactiveLibravatar Shawn O. Pearce1-2/+2
2007-12-19Fix interactive rebase to preserve author email addressLibravatar Sean1-1/+1
2007-12-17rebase -p -i: handle "no changes" gracefullyLibravatar Johannes Schindelin1-1/+6
2007-12-02Merge branch 'js/rebase-i-rerere'Libravatar Junio C Hamano1-1/+4
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainLibravatar Wincent Colaiuta1-0/+5
2007-11-28rebase -i: give rerere a chanceLibravatar Johannes Schindelin1-1/+4
2007-11-28Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeLibravatar Junio C Hamano1-2/+2
2007-11-22rebase -i: move help to end of todo fileLibravatar Johannes Schindelin1-6/+8
2007-11-17Merge branch 'ph/parseopt-sh'Libravatar Junio C Hamano1-0/+1
2007-11-09Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-11-08Avoid a few unportable, needlessly nested "...`...".Libravatar Ralf Wildenhues1-1/+1
2007-11-06scripts: Add placeholders for OPTIONS_SPECLibravatar Junio C Hamano1-0/+1
2007-10-30Merge branch 'maint' into HEADLibravatar Junio C Hamano1-3/+4
2007-10-30git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Libravatar Björn Steinbrink1-0/+2
2007-10-30git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Libravatar Björn Steinbrink1-2/+2
2007-10-30Fix --strategy parsing in git-rebase--interactive.shLibravatar Björn Steinbrink1-1/+0
2007-10-16git-rebase--interactive.sh: Quote arguments to testLibravatar Michael W. Olson1-1/+1
2007-10-15Merge branch 'maint'Libravatar Shawn O. Pearce1-2/+2
2007-10-15rebase -i: use diff plumbing instead of porcelainLibravatar Johannes Schindelin1-2/+2
2007-10-03Merge branch 'js/rebase-i'Libravatar Junio C Hamano1-8/+15
2007-10-03Merge branch 'jc/autogc'Libravatar Junio C Hamano1-0/+2
2007-09-29Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-09-29rebase -i: squash should retain the authorship of the _first_ commitLibravatar Johannes Schindelin1-1/+1
2007-09-29rebase -i: support single-letter abbreviations for the actionsLibravatar Johannes Schindelin1-4/+4
2007-09-26rebase -i: work on a detached HEADLibravatar Johannes Schindelin1-8/+15
2007-09-26Merge branch 'jc/autogc' into js/rebase-iLibravatar Junio C Hamano1-0/+2
2007-09-26rebase -i: create .dotest-merge after validating options.Libravatar Matt Kraai1-4/+4
2007-09-25rebase -i: avoid exporting GIT_AUTHOR_* variablesLibravatar Johannes Schindelin1-2/+8