summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge branch 'jx/i18n-1.7.11'Junio C Hamano2012-07-311-1/+1
|\
| * i18n: Rewrite gettext messages start with dashJiang Xin2012-07-261-1/+1
* | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-251-0/+8
|\ \ | |/ |/|
| * rebase -i: handle fixup of root commit correctlyChris Webb2012-07-241-0/+8
* | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-151-0/+31
|\ \ | |/
| * t3404: make test 57 work with dash and othersMichael J Gruber2012-07-051-1/+5
| * Add tests for rebase -i --root without --ontoChris Webb2012-06-261-0/+27
* | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-131-0/+117
|/
* Merge branch 'maint'Junio C Hamano2012-05-201-0/+1
|\
| * t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt2012-05-201-0/+1
* | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-301-1/+1
|/
* rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-091-0/+30
* rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-261-0/+14
* rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-191-1/+1
* rebase: write a reflog entry when finishingJeff King2011-05-271-1/+1
* Merge branch 'maint'Junio C Hamano2010-12-281-1/+2
|\
| * Fix false positives in t3404 due to SHELL=/bin/falseRobin H. Johnson2010-12-281-1/+2
* | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-0/+1
|\ \
View Lorry Controller Status