summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)Author
2015-08-03Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin
2015-06-05Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano
2015-04-29rebase -i: redo tasks that die during cherry-pickPhil Hord
2015-03-23Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano
2015-03-20t: fix trivial &&-chain breakageJeff King
2015-03-20t: fix moderate &&-chain breakageJeff King
2015-03-17Merge branch 'es/rebase-i-count-todo'Junio C Hamano
2015-03-06rebase-interactive: suppress whitespace preceding item countEric Sunshine
2015-01-22rebase -i: use full object name internally throughout the scriptKirill A. Shutemov
2014-06-06Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano
2014-05-19rebase --keep-empty -i: add testMichael S. Tsirkin
2014-03-19tests: use "env" to run commands with temporary env-var settingsDavid Tran
2013-09-11Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano
2013-08-26rebase -i: fix short SHA-1 collisionJunio C Hamano
2013-08-26t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine
2013-08-26t3404: make tests more self-containedEric Sunshine
2013-08-07die_with_status: use "printf '%s\n'", not "echo"Matthieu Moy
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano
2013-07-02Do not ignore merge options in interactive rebaseArnaud Fontaine
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano
2013-06-24rebase -i: use a better reflog messageRamkumar Ramachandra
2013-06-23Merge branch 'mz/rebase-tests'Junio C Hamano
2013-06-14rebase: use peel_committish() where appropriateRamkumar Ramachandra
2013-06-14t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra
2013-06-07add tests for rebasing merged historyMartin von Zweigbergk
2013-05-28test: rebase: fix --interactive testFelipe Contreras
2013-03-25t4304: use test_config to set/unset git config variablesYann Droneaud
2013-02-17Merge branch 'jk/rebase-i-comment-char'Junio C Hamano
2013-02-12rebase -i: respect core.commentcharJohn Keeping
2012-12-23tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk
2012-09-30Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt
2012-09-18rebase -i: Add tests for "--edit-todo"Andrew Wong
2012-07-31Merge branch 'jx/i18n-1.7.11'Junio C Hamano
2012-07-27i18n: Rewrite gettext messages start with dashJiang Xin
2012-07-25Merge branch 'cw/rebase-i-root'Junio C Hamano
2012-07-24rebase -i: handle fixup of root commit correctlyChris Webb
2012-07-16Merge branch 'cw/rebase-i-root'Junio C Hamano
2012-07-05t3404: make test 57 work with dash and othersMichael J Gruber
2012-06-26Add tests for rebase -i --root without --ontoChris Webb
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong
2012-05-20Merge branch 'maint'Junio C Hamano
2012-05-20t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt
2012-04-30diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek
2012-04-09rebase -i continue: don't skip commits that only change submodulesJohn Keeping
2011-08-26rebase -i: clean error message for --continue after failed execMatthieu Moy
2011-06-19rebase -i -p: include non-first-parent commits in todo listAndrew Wong
2011-05-27rebase: write a reflog entry when finishingJeff King