summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-optionsFabian Ruch2015-12-111-0/+16
* Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
|\
| * t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-031-0/+12
|\ \
| * | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warnJunio C Hamano2015-10-281-1/+1
| * | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-281-0/+12
| |/
* | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-161-0/+15
|\ \ | |/
| * rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-051-0/+15
* | Merge branch 'dt/reflog-tests'Junio C Hamano2015-08-121-5/+5
|\ \
| * | tests: remove some direct access to .git/logsdt/reflog-testsDavid Turner2015-07-281-5/+5
| * | Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-051-0/+47
| |\ \
* | \ \ Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-031-0/+123
|\ \ \ \ | | |_|/ | |/| |
| * | | git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-301-0/+39
| * | | git rebase -i: warn about removed commitsGalan Rémi2015-06-301-0/+66
| * | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-301-0/+18
* | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2015-07-131-0/+21
|\ \ \ \ | |/ / / |/| | |
| * | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skipJohannes Schindelin2015-06-291-1/+1
| * | | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-291-0/+21
* | | | Merge branch 'ph/rebase-i-redo'Junio C Hamano2015-05-191-0/+47
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | rebase -i: redo tasks that die during cherry-pickph/rebase-i-redoPhil Hord2015-04-291-0/+47
| * | Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano2015-03-231-0/+9
| |\ \
* | | | t: fix trivial &&-chain breakageJeff King2015-03-201-1/+1
* | | | t: fix moderate &&-chain breakageJeff King2015-03-201-1/+1
* | | | Merge branch 'es/rebase-i-count-todo'Junio C Hamano2015-03-171-0/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | rebase-interactive: suppress whitespace preceding item countEric Sunshine2015-03-061-0/+9
| |/
* | rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrevKirill A. Shutemov2015-01-221-0/+7
|/
* Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano2014-06-061-0/+8
|\
| * rebase --keep-empty -i: add testmt/rebase-i-keep-empty-testMichael S. Tsirkin2014-05-191-0/+8
* | tests: use "env" to run commands with temporary env-var settingsdt/tests-with-env-not-subshellDavid Tran2014-03-191-56/+13
|/
* Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano2013-09-111-2/+87
|\
| * rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrevJunio C Hamano2013-08-251-1/+1
| * t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine2013-08-251-0/+24
| * t3404: make tests more self-containedEric Sunshine2013-08-251-2/+63
* | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-messageMatthieu Moy2013-08-071-0/+13
|/
* Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-181-0/+15
|\
| * rebase -i: use a better reflog messageRamkumar Ramachandra2013-06-231-0/+15
* | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-optionsArnaud Fontaine2013-07-021-0/+11
* | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-241-0/+11
|\ \
| * | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-141-1/+1
| * | t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-141-0/+11
* | | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-231-9/+1
|\ \ \ | |/ / |/| |
| * | add tests for rebasing merged historyMartin von Zweigbergk2013-06-071-9/+1
| |/
* | test: rebase: fix --interactive testFelipe Contreras2013-05-281-1/+1
|/
* t4304: use test_config to set/unset git config variablesYann Droneaud2013-03-251-2/+1
* Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-171-0/+14
|\
| * rebase -i: respect core.commentcharJohn Keeping2013-02-121-0/+14
* | tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk2012-12-221-6/+0
|/
* Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-291-0/+18
|\
| * rebase -i: Add tests for "--edit-todo"Andrew Wong2012-09-171-0/+18
* | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-181-0/+11
|/
View Lorry Controller Status