aboutsummaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAge
* rebase -i: remember merge options beyond continue actionsFabian Ruch2015-12-11
* Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-11
|\
| * t3404: fix quoting of redirect for some versions of bashCharles Bailey2015-12-04
* | 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
| * | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-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
* | Merge branch 'dt/reflog-tests'Junio C Hamano2015-08-12
|\ \
| * | tests: remove some direct access to .git/logsDavid Turner2015-07-28
| * | Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-05
| |\ \
* | \ \ 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 '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
| * | | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-29
* | | | 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
| |\ \
* | | | t: fix trivial &&-chain breakageJeff King2015-03-20
* | | | t: fix moderate &&-chain breakageJeff King2015-03-20
* | | | Merge branch 'es/rebase-i-count-todo'Junio C Hamano2015-03-17
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | rebase-interactive: suppress whitespace preceding item countEric Sunshine2015-03-06
| |/
* | rebase -i: use full object name internally throughout the scriptKirill A. Shutemov2015-01-22
|/
* Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano2014-06-06
|\
| * rebase --keep-empty -i: add testMichael S. Tsirkin2014-05-19
* | tests: use "env" to run commands with temporary env-var settingsDavid Tran2014-03-19
|/
* Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano2013-09-11
|\
| * rebase -i: fix short SHA-1 collisionJunio C Hamano2013-08-25
| * t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine2013-08-25
| * t3404: make tests more self-containedEric Sunshine2013-08-25
* | die_with_status: use "printf '%s\n'", not "echo"Matthieu Moy2013-08-07
|/
* Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-18
|\
| * rebase -i: use a better reflog messageRamkumar Ramachandra2013-06-23
* | Do not ignore merge options in interactive rebaseArnaud Fontaine2013-07-02
* | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-24
|\ \
| * | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-14
| * | t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-14
* | | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-23
|\ \ \ | |/ / |/| |
| * | add tests for rebasing merged historyMartin von Zweigbergk2013-06-07
| |/
* | test: rebase: fix --interactive testFelipe Contreras2013-05-28
|/
* t4304: use test_config to set/unset git config variablesYann Droneaud2013-03-25
* Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-17
|\
| * rebase -i: respect core.commentcharJohn Keeping2013-02-12
* | tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk2012-12-22
|/
* Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-29
|\
| * rebase -i: Add tests for "--edit-todo"Andrew Wong2012-09-17
* | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-18
|/