summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * scripts: do not get confused with HEAD in work treeJunio C Hamano2007-11-281-2/+2
* | rebase -i: move help to end of todo fileJohannes Schindelin2007-11-221-6/+8
* | Merge branch 'ph/parseopt-sh'Junio C Hamano2007-11-171-0/+1
|\ \
| * | scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-061-0/+1
* | | Merge branch 'maint'Junio C Hamano2007-11-091-1/+1
|\ \ \ | |/ / |/| / | |/
| * Avoid a few unportable, needlessly nested "...`...".Ralf Wildenhues2007-11-081-1/+1
* | Merge branch 'maint' into HEADJunio C Hamano2007-10-301-3/+4
|\ \ | |/
| * git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink2007-10-301-0/+2
| * git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink2007-10-301-2/+2
| * Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink2007-10-301-1/+0
* | git-rebase--interactive.sh: Quote arguments to testMichael W. Olson2007-10-161-1/+1
* | Merge branch 'maint'Shawn O. Pearce2007-10-151-2/+2
|\ \ | |/
| * rebase -i: use diff plumbing instead of porcelainJohannes Schindelin2007-10-151-2/+2
* | Merge branch 'js/rebase-i'Junio C Hamano2007-10-031-8/+15
|\ \
| * | rebase -i: work on a detached HEADJohannes Schindelin2007-09-261-8/+15
| * | Merge branch 'jc/autogc' into js/rebase-iJunio C Hamano2007-09-261-0/+2
| |\ \
* | \ \ Merge branch 'jc/autogc'Junio C Hamano2007-10-031-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano2007-09-061-0/+2
* | | | Merge branch 'maint'Junio C Hamano2007-09-291-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin2007-09-291-1/+1
* | | | rebase -i: support single-letter abbreviations for the actionsJohannes Schindelin2007-09-291-4/+4
| |_|/ |/| |
* | | rebase -i: create .dotest-merge after validating options.Matt Kraai2007-09-261-4/+4
* | | rebase -i: avoid exporting GIT_AUTHOR_* variablesJohannes Schindelin2007-09-251-2/+8
* | | rebase -i: Fix numbers in progress reportJohannes Schindelin2007-09-251-2/+2
View Lorry Controller Status