summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindLibravatar Johannes Schindelin1-1/+1
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugLibravatar Johannes Schindelin1-0/+21
2015-06-05Merge branch 'ph/rebase-i-redo' into maintLibravatar Junio C Hamano1-0/+47
2015-05-19Merge branch 'ph/rebase-i-redo'Libravatar Junio C Hamano1-0/+47
2015-04-29rebase -i: redo tasks that die during cherry-pickLibravatar Phil Hord1-0/+47
2015-03-23Merge branch 'es/rebase-i-count-todo' into maintLibravatar Junio C Hamano1-0/+9
2015-03-20t: fix trivial &&-chain breakageLibravatar Jeff King1-1/+1
2015-03-20t: fix moderate &&-chain breakageLibravatar Jeff King1-1/+1
2015-03-17Merge branch 'es/rebase-i-count-todo'Libravatar Junio C Hamano1-0/+9
2015-03-06rebase-interactive: suppress whitespace preceding item countLibravatar Eric Sunshine1-0/+9
2015-01-22rebase -i: use full object name internally throughout the scriptLibravatar Kirill A. Shutemov1-0/+7
2014-06-06Merge branch 'mt/rebase-i-keep-empty-test'Libravatar Junio C Hamano1-0/+8
2014-05-19rebase --keep-empty -i: add testLibravatar Michael S. Tsirkin1-0/+8
2014-03-19tests: use "env" to run commands with temporary env-var settingsLibravatar David Tran1-56/+13
2013-09-11Merge branch 'es/rebase-i-no-abbrev'Libravatar Junio C Hamano1-2/+87
2013-08-25rebase -i: fix short SHA-1 collisionLibravatar Junio C Hamano1-1/+1
2013-08-25t3404: rebase -i: demonstrate short SHA-1 collisionLibravatar Eric Sunshine1-0/+24
2013-08-25t3404: make tests more self-containedLibravatar Eric Sunshine1-2/+63
2013-08-07die_with_status: use "printf '%s\n'", not "echo"Libravatar Matthieu Moy1-0/+13
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Libravatar Junio C Hamano1-0/+15
2013-07-02Do not ignore merge options in interactive rebaseLibravatar Arnaud Fontaine1-0/+11
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Libravatar Junio C Hamano1-0/+11
2013-06-23rebase -i: use a better reflog messageLibravatar Ramkumar Ramachandra1-0/+15
2013-06-23Merge branch 'mz/rebase-tests'Libravatar Junio C Hamano1-9/+1
2013-06-14rebase: use peel_committish() where appropriateLibravatar Ramkumar Ramachandra1-1/+1
2013-06-14t/rebase: add failing tests for a peculiar revisionLibravatar Ramkumar Ramachandra1-0/+11
2013-06-07add tests for rebasing merged historyLibravatar Martin von Zweigbergk1-9/+1
2013-05-28test: rebase: fix --interactive testLibravatar Felipe Contreras1-1/+1
2013-03-25t4304: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-2/+1
2013-02-17Merge branch 'jk/rebase-i-comment-char'Libravatar Junio C Hamano1-0/+14
2013-02-12rebase -i: respect core.commentcharLibravatar John Keeping1-0/+14
2012-12-22tests: move test_cmp_rev to test-lib-functionsLibravatar Martin von Zweigbergk1-6/+0
2012-09-29Merge branch 'aw/rebase-i-edit-todo'Libravatar Junio C Hamano1-0/+18
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionLibravatar Johannes Sixt1-0/+11
2012-09-17rebase -i: Add tests for "--edit-todo"Libravatar Andrew Wong1-0/+18
2012-07-31Merge branch 'jx/i18n-1.7.11'Libravatar Junio C Hamano1-1/+1
2012-07-26i18n: Rewrite gettext messages start with dashLibravatar Jiang Xin1-1/+1
2012-07-25Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano1-0/+8
2012-07-24rebase -i: handle fixup of root commit correctlyLibravatar Chris Webb1-0/+8
2012-07-15Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano1-0/+31
2012-07-05t3404: make test 57 work with dash and othersLibravatar Michael J Gruber1-1/+5
2012-06-26Add tests for rebase -i --root without --ontoLibravatar Chris Webb1-0/+27
2012-06-13rebase -i: teach "--exec <cmd>"Libravatar Lucien Kong1-0/+117
2012-05-20Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2012-05-20t3404: begin "exchange commits with -p" test with correct preconditionsLibravatar Johannes Sixt1-0/+1
2012-04-30diff --stat: use less columns for change countsLibravatar Zbigniew Jędrzejewski-Szmek1-1/+1
2012-04-09rebase -i continue: don't skip commits that only change submodulesLibravatar John Keeping1-0/+30
2011-08-26rebase -i: clean error message for --continue after failed execLibravatar Matthieu Moy1-0/+14
2011-06-19rebase -i -p: include non-first-parent commits in todo listLibravatar Andrew Wong1-1/+1
2011-05-27rebase: write a reflog entry when finishingLibravatar Jeff King1-1/+1