aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAge
* rebase -i: remember merge options beyond continue actionsFabian Ruch2015-12-11
* rebase-i-exec: Allow space in SHELL_PATHFredrik Medley2015-11-13
* Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-03
|\
| * rebase-i: work around Windows CRLF line endingsJunio C Hamano2015-10-28
* | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-16
|\ \ | |/
| * rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-05
| * rebase-i: explicitly accept tab as separator in commandsMatthieu Moy2015-10-02
* | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-03
|\ \ | |/
| * git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-30
| * git rebase -i: warn about removed commitsGalan Rémi2015-06-30
| * git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-30
* | Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano2015-08-03
|\ \
| * | git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo2015-06-15
* | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2015-07-13
|\ \ \ | |/ / |/| |
| * | rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2015-06-29
* | | Merge branch 'mm/rebase-i-post-rewrite-exec'Junio C Hamano2015-06-01
|\ \ \ | |_|/ |/| |
| * | rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2015-05-22
| * | Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-25
| |\ \
* | \ \ Merge branch 'ph/rebase-i-redo'Junio C Hamano2015-05-19
|\ \ \ \
| * | | | rebase -i: redo tasks that die during cherry-pickPhil Hord2015-04-29
| * | | | Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano2015-03-23
| |\ \ \ \
| * \ \ \ \ Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2015-03-05
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-11
|\ \ \ \ \ \ \
| * | | | | | | *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy2014-12-01
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'es/rebase-i-count-todo'Junio C Hamano2015-03-17
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | rebase-interactive: re-word "item count" commentEric Sunshine2015-03-06
| * | | | | | rebase-interactive: suppress whitespace preceding item countEric Sunshine2015-03-06
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ks/rebase-i-abbrev'Junio C Hamano2015-02-17
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | rebase -i: use full object name internally throughout the scriptKirill A. Shutemov2015-01-22
| |/ / /
* | | | Show number of TODO items for interactive rebaseOnno Kortmann2014-12-10
|/ / /
* | | 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
| |/ /