aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAge
* rebase-interactive: silence warning when no commits rewrittenJeff King2010-04-18
* Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-03
|\
| * Teach rebase the --no-ff option.Marc Branchaud2010-03-24
* | Merge branch 'do/rebase-i-arbitrary'Junio C Hamano2010-04-03
|\ \
| * | rebase--interactive: don't require what's rebased to be a branchDave Olszewski2010-03-14
| |/
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|\ \
| * | rebase -i: use new --ff cherry-pick optionChristian Couder2010-03-20
| |/
* | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-28
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \ | |/ |/|
| * rebase: support automatic notes copyingThomas Rast2010-03-12
| * rebase -i: invoke post-rewrite hookThomas Rast2010-03-12
| * commit --amend: invoke post-rewrite hookThomas Rast2010-03-12
* | work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano2010-01-26
* | fix portability issues with $ in double quotesStephen Boyd2010-01-26
* | rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano2010-01-23
|/
* rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty2010-01-22
* Merge branch 'mh/rebase-fixup'Junio C Hamano2010-01-20
|\
| * rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-14
| * rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty2010-01-14
| * rebase -i: Change function make_squash_message into update_squash_messageMichael Haggerty2010-01-14
| * rebase -i: Extract function do_with_authorMichael Haggerty2010-01-14
| * rebase -i: Handle the author script all in one place in do_nextMichael Haggerty2010-01-14
| * rebase -i: Extract a function "commit_message"Michael Haggerty2010-01-14
| * rebase -i: Simplify commit counting for generated commit messagesMichael Haggerty2010-01-14
| * rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-14
| * rebase -i: Introduce a constant AMENDMichael Haggerty2010-01-14
| * rebase -i: Introduce a constant AUTHOR_SCRIPTMichael Haggerty2010-01-14
| * rebase -i: Document how temporary files are usedMichael Haggerty2010-01-14
| * rebase -i: Use symbolic constant $MSG consistentlyMichael Haggerty2010-01-14
| * rebase -i: Use "test -n" instead of "test ! -z"Michael Haggerty2010-01-14
| * rebase -i: Inline expressionMichael Haggerty2010-01-14
| * rebase -i: Remove dead codeMichael Haggerty2010-01-14
| * rebase -i: Make the condition for an "if" more transparentMichael Haggerty2010-01-14
* | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-20
|\ \
| * | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-06
* | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-20
|\ \ \ | | |/ | |/|
| * | rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-12
| |/
| * Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-07
* | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-13
|\ \
| * | rebase -i: teach --onto A...B syntaxNanako Shiraishi2010-01-07
* | | rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-11
* | | Merge branch 'maint'Junio C Hamano2009-12-19
|\ \ \ | |_|/ |/| |
| * | rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson2009-12-19
| * | Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano2009-12-03
| |\ \
* | \ \ Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-25
|\ \ \ \ | | |/ / | |/| |
| * | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-23
| | |/ | |/|
* | | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-15
|\ \ \
| * | | Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
| |/ /
* | | Merge branch 'maint'Junio C Hamano2009-10-28
|\ \ \ | | |/ | |/|
| * | rebase -i: more graceful handling of invalid commandsJan Krüger2009-10-27
| |/