aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAge
* rebase: omit patch-identical commits with --fork-pointJohn Keeping2014-07-16
* Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-06-25
|\
| * git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
* | Merge branch 'rr/rebase-autostash-fix'Junio C Hamano2014-06-16
|\ \ | |/ |/|
| * rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-19
* | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-21
|\ \
| * | rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-17
* | | Merge branch 'us/printf-not-echo'Junio C Hamano2014-03-25
|\ \ \ | |/ /
| * | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-17
* | | rebase: add the --gpg-sign optionNicolas Vigier2014-02-11
|/ /
* | remove #!interpreter line from shell librariesJonathan Nieder2013-11-26
* | rebase -i: respect core.abbrevKirill A. Shutemov2013-09-30
* | Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano2013-09-11
|\ \
| * | rebase -i: fix short SHA-1 collisionJunio C Hamano2013-08-25
* | | Merge branch 'rt/rebase-p-no-merge-summary'Junio C Hamano2013-09-11
|\ \ \
| * | | rebase --preserve-merges: ignore "merge.log" configRalf Thielow2013-08-21
| |/ /
* | | Merge branch 'es/rebase-i-respect-core-commentchar'Junio C Hamano2013-09-11
|\ \ \ | |/ / |/| |
| * | rebase -i: fix cases ignoring core.commentcharEric Sunshine2013-08-18
* | | Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-18
|\ \ \
| * | | rebase -i: use a better reflog messageRamkumar Ramachandra2013-06-23
| |/ /
* | | Merge branch 'af/rebase-i-merge-options'Junio C Hamano2013-07-11
|\ \ \
| * | | Do not ignore merge options in interactive rebaseArnaud Fontaine2013-07-02
| | |/ | |/|
* | | rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-27
|/ /
* | rebase -i: return control to caller, for housekeepingRamkumar Ramachandra2013-05-12
* | rebase -i: don't error out if $state_dir already existsRamkumar Ramachandra2013-05-12
|/
* bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger2013-04-25
* Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-17
|\
| * rebase -i: respect core.commentcharJohn Keeping2013-02-12
* | Merge branch 'ph/rebase-preserve-all-merges'Junio C Hamano2013-01-21
|\ \ | |/ |/|
| * rebase --preserve-merges: keep all merge commits including empty onesPhil Hord2013-01-14
* | Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-29
|\ \
| * | rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt2012-09-19
| * | rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-17
| * | rebase -i: Refactor help messages for todo fileAndrew Wong2012-09-17
| * | Merge branch 'mg/rebase-i-onto-reflog-in-full'Junio C Hamano2012-08-29
| |\ \
* | | | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-18
* | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-10
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano2012-09-10
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * rebase -i: use full onto sha1 in reflogMichael J Gruber2012-08-10
| | * Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano2012-05-10
| | |\
* | | \ Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-25
|\ \ \ \
| * | | | rebase -i: handle fixup of root commit correctlyChris Webb2012-07-24
* | | | | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-15
|\ \ \ \ \ | |/ / / /
| * | | | rebase -i: support --root without --ontoChris Webb2012-06-26
| |/ / /
* | | | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-13
|\ \ \ \
| * | | | rebase: don't source git-sh-setup twiceMartin von Zweigbergk2012-06-26
| |/ / /
* | | | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-13
|/ / /
* | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-30
|\ \ \
| * | | git-rebase: add keep_empty flagNeil Horman2012-04-24
* | | | Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano2012-04-23
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |