summaryrefslogtreecommitdiff
path: root/t/t3400-rebase.sh
AgeCommit message (Expand)Author
2021-08-02mingw: align symlinks-related rmdir() behavior with LinuxThomas Bétous
2021-03-23rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason
2021-02-11tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason
2020-11-19t34*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-03-05Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano
2020-02-24rebase: refuse to switch to branch already checked out elsewhereEric Sunshine
2020-02-24t3400: make test clean up after itselfEric Sunshine
2020-02-16rebase: rename the two primary rebase backendsElijah Newren
2020-02-16rebase tests: mark tests specific to the am-backend with --amElijah Newren
2020-02-16rebase: fix handling of restrict_revisionElijah Newren
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerElijah Newren
2019-12-16Merge branch 'dl/rebase-with-autobase'Junio C Hamano
2019-12-05rebase: fix format.useAutoBase breakageDenton Liu
2019-12-05t3400: demonstrate failure with format.useAutoBaseDenton Liu
2019-11-21t: teach test_cmp_rev to accept ! for not-equalsDenton Liu
2019-09-30Merge branch 'dl/rebase-i-keep-base'Junio C Hamano
2019-09-09Merge branch 'bc/reread-attributes-during-rebase'Junio C Hamano
2019-09-03am: reload .gitattributes after patching itbrian m. carlson
2019-08-27rebase: fast-forward --onto in more casesDenton Liu
2019-05-15t3400: stop referring to the scripted rebaseJohannes Schindelin
2019-04-16Merge branch 'ab/drop-scripted-rebase'Junio C Hamano
2019-03-20rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason
2019-03-04built-in rebase: set ORIG_HEAD just once, before the rebaseJohannes Schindelin
2019-03-04built-in rebase: demonstrate that ORIG_HEAD is not set correctlyJohannes Schindelin
2018-10-06t/*: fix ordering of expected/observed argumentsMatthew DeVore
2018-07-16t3000-t3999: fix broken &&-chainsEric Sunshine
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy
2017-11-18rebase: use mboxrd format to avoid split errorsEric Wong
2016-06-17tests: unpack-trees: update to use test_i18n* functionsVasco Almeida
2014-07-16rebase: omit patch-identical commits with --fork-pointJohn Keeping
2014-03-19rebase: allow "-" short-hand for the previous branchBrian Gesiak
2014-01-09rebase: fix fork-point with zero argumentsJohn Keeping
2013-12-10rebase: use reflog to find common base with upstreamJohn Keeping
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano
2013-06-23Merge branch 'mz/rebase-tests'Junio C Hamano
2013-06-20Merge branch 'fc/show-non-empty-errors-in-test'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-09test: test_must_be_empty helperJunio C Hamano
2013-06-07tests: move test for rebase messages from t3400 to t3406Martin von Zweigbergk
2013-06-07add tests for rebasing merged historyMartin von Zweigbergk
2013-04-26Merge branch 'ph/rebase-original'Junio C Hamano
2013-04-23rebase: find orig_head unambiguouslyPhil Hord
2013-03-25t3400: use test_config to set/unset git config variablesYann Droneaud
2012-07-25i18n: rebase: mark messages for translationJiang Xin
2012-03-05Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto
2012-02-10Merge branch 'jc/parse-date-raw'Junio C Hamano
2012-02-04parse_date(): '@' prefix forces git-timestampJunio C Hamano