summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-12/+3
|\
| * rebase -i: use new --ff cherry-pick optionChristian Couder2010-03-201-12/+3
* | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-281-2/+3
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-2/+50
|\ \ | |/ |/|
| * rebase: support automatic notes copyingThomas Rast2010-03-121-0/+4
| * rebase -i: invoke post-rewrite hookThomas Rast2010-03-121-1/+45
| * commit --amend: invoke post-rewrite hookThomas Rast2010-03-121-1/+1
* | work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano2010-01-261-3/+3
* | fix portability issues with $ in double quotesStephen Boyd2010-01-261-1/+1
* | rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano2010-01-231-4/+4
|/
* rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty2010-01-221-1/+1
* Merge branch 'mh/rebase-fixup'Junio C Hamano2010-01-201-81/+143
|\
| * rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-141-39/+27
| * rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty2010-01-141-27/+54
| * rebase -i: Change function make_squash_message into update_squash_messageMichael Haggerty2010-01-141-15/+20
| * rebase -i: Extract function do_with_authorMichael Haggerty2010-01-141-12/+15
| * rebase -i: Handle the author script all in one place in do_nextMichael Haggerty2010-01-141-2/+2
| * rebase -i: Extract a function "commit_message"Michael Haggerty2010-01-141-5/+10
| * rebase -i: Simplify commit counting for generated commit messagesMichael Haggerty2010-01-141-8/+3
| * rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-141-1/+1
| * rebase -i: Introduce a constant AMENDMichael Haggerty2010-01-141-4/+12
| * rebase -i: Introduce a constant AUTHOR_SCRIPTMichael Haggerty2010-01-141-6/+11
| * rebase -i: Document how temporary files are usedMichael Haggerty2010-01-141-7/+34
| * rebase -i: Use symbolic constant $MSG consistentlyMichael Haggerty2010-01-141-4/+4
| * rebase -i: Use "test -n" instead of "test ! -z"Michael Haggerty2010-01-141-1/+1
| * rebase -i: Inline expressionMichael Haggerty2010-01-141-2/+1
| * rebase -i: Remove dead codeMichael Haggerty2010-01-141-1/+0
| * rebase -i: Make the condition for an "if" more transparentMichael Haggerty2010-01-141-1/+2
* | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-201-0/+37
|\ \
| * | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+37
* | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-201-10/+35
|\ \ \ | | |/ | |/|
| * | rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-121-1/+1
| |/
| * Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-071-10/+35
* | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-131-1/+20
|\ \
| * | rebase -i: teach --onto A...B syntaxNanako Shiraishi2010-01-071-1/+20
* | | rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-111-1/+1
* | | Merge branch 'maint'Junio C Hamano2009-12-191-1/+1
|\ \ \ | |_|/ |/| |
| * | rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson2009-12-191-1/+1
| * | Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano2009-12-031-5/+5
| |\ \
* | \ \ Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-251-5/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-231-5/+5
| | |/ | |/|
* | | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-151-3/+3
|\ \ \
| * | | Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-3/+3
| |/ /
* | | Merge branch 'maint'Junio C Hamano2009-10-281-1/+6
|\ \ \ | | |/ | |/|
| * | rebase -i: more graceful handling of invalid commandsJan Krüger2009-10-271-1/+6
| |/
* | rebase -i: fix reword when using a terminal editorStephen Boyd2009-10-191-1/+1
* | Teach 'rebase -i' the command "reword"Björn Gustavsson2009-10-071-0/+9
|/
* Fix rebase -p --ontoGreg Price2009-07-221-1/+1
* Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maintJunio C Hamano2009-06-111-1/+1
|\
| * rebase--interactive: remote stray closing parenthesisUwe Kleine-König2009-06-111-1/+1
View Lorry Controller Status