summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph/rebase-i-redo'Junio C Hamano2015-05-191-0/+16
|\
| * rebase -i: redo tasks that die during cherry-pickph/rebase-i-redoPhil Hord2015-04-291-0/+16
| * Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano2015-03-231-1/+2
| |\
| * \ Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2015-03-051-9/+8
| |\ \
* | \ \ Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-3/+3
|\ \ \ \
| * | | | *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy2014-12-011-3/+3
* | | | | Merge branch 'es/rebase-i-count-todo'Junio C Hamano2015-03-171-1/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | rebase-interactive: re-word "item count" commentes/rebase-i-count-todoEric Sunshine2015-03-061-1/+1
| * | | | rebase-interactive: suppress whitespace preceding item countEric Sunshine2015-03-061-0/+1
| | |/ / | |/| |
* | | | Merge branch 'ks/rebase-i-abbrev'Junio C Hamano2015-02-171-9/+8
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrevKirill A. Shutemov2015-01-221-9/+8
| |/
* | Show number of TODO items for interactive rebaseok/rebase-i-count-todoOnno Kortmann2014-12-101-1/+3
|/
* rebase: omit patch-identical commits with --fork-pointjk/rebase-am-fork-pointJohn Keeping2014-07-161-1/+1
* Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-06-251-1/+1
|\
| * git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
* | Merge branch 'rr/rebase-autostash-fix'Junio C Hamano2014-06-161-2/+2
|\ \ | |/ |/|
| * rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-191-2/+2
* | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-211-0/+15
|\ \
| * | rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-171-0/+15
* | | Merge branch 'us/printf-not-echo'Junio C Hamano2014-03-251-1/+1
|\ \ \ | |/ /
| * | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-171-1/+1
* | | rebase: add the --gpg-sign optionNicolas Vigier2014-02-111-13/+26
|/ /
* | remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-261-6/+3
* | rebase -i: respect core.abbrevKirill A. Shutemov2013-09-301-1/+1
* | Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano2013-09-111-0/+30
|\ \
| * | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrevJunio C Hamano2013-08-251-0/+30
* | | Merge branch 'rt/rebase-p-no-merge-summary'Junio C Hamano2013-09-111-1/+2
|\ \ \
| * | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summaryRalf Thielow2013-08-211-1/+2
| |/ /
* | | Merge branch 'es/rebase-i-respect-core-commentchar'Junio C Hamano2013-09-111-1/+1
|\ \ \ | |/ / |/| |
| * | rebase -i: fix cases ignoring core.commentchares/rebase-i-respect-core-commentcharEric Sunshine2013-08-181-1/+1
* | | Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-181-1/+5
|\ \ \
| * | | rebase -i: use a better reflog messageRamkumar Ramachandra2013-06-231-1/+5
| |/ /
* | | Merge branch 'af/rebase-i-merge-options'Junio C Hamano2013-07-111-5/+16
|\ \ \
| * | | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-optionsArnaud Fontaine2013-07-021-5/+16
| | |/ | |/|
* | | rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-271-5/+20
|/ /
* | rebase -i: return control to caller, for housekeepingRamkumar Ramachandra2013-05-121-4/+5
* | rebase -i: don't error out if $state_dir already existsRamkumar Ramachandra2013-05-121-1/+1
|/
* bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger2013-04-251-0/+5
* Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-171-40/+44
|\
| * rebase -i: respect core.commentcharJohn Keeping2013-02-121-40/+44
* | Merge branch 'ph/rebase-preserve-all-merges'Junio C Hamano2013-01-211-1/+6
|\ \ | |/ |/|
| * rebase --preserve-merges: keep all merge commits including empty onesPhil Hord2013-01-141-1/+6
* | Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-291-13/+40
|\ \
| * | rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt2012-09-191-2/+3
| * | rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-171-0/+17
| * | rebase -i: Refactor help messages for todo fileAndrew Wong2012-09-171-11/+20
| * | Merge branch 'mg/rebase-i-onto-reflog-in-full'Junio C Hamano2012-08-291-2/+1
| |\ \
* | | | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-181-0/+4
* | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-101-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano2012-09-101-2/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
View Lorry Controller Status