summaryrefslogtreecommitdiff
path: root/t/t3400-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2020-03-05Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Libravatar Junio C Hamano1-1/+19
2020-02-24rebase: refuse to switch to branch already checked out elsewhereLibravatar Eric Sunshine1-0/+18
2020-02-24t3400: make test clean up after itselfLibravatar Eric Sunshine1-1/+1
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren1-8/+8
2020-02-16rebase tests: mark tests specific to the am-backend with --amLibravatar Elijah Newren1-5/+5
2020-02-16rebase: fix handling of restrict_revisionLibravatar Elijah Newren1-1/+19
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerLibravatar Elijah Newren1-1/+7
2019-12-16Merge branch 'dl/rebase-with-autobase'Libravatar Junio C Hamano1-0/+6
2019-12-05rebase: fix format.useAutoBase breakageLibravatar Denton Liu1-1/+1
2019-12-05t3400: demonstrate failure with format.useAutoBaseLibravatar Denton Liu1-0/+6
2019-11-21t: teach test_cmp_rev to accept ! for not-equalsLibravatar Denton Liu1-1/+1
2019-09-30Merge branch 'dl/rebase-i-keep-base'Libravatar Junio C Hamano1-1/+1
2019-09-09Merge branch 'bc/reread-attributes-during-rebase'Libravatar Junio C Hamano1-0/+36
2019-09-03am: reload .gitattributes after patching itLibravatar brian m. carlson1-0/+36
2019-08-27rebase: fast-forward --onto in more casesLibravatar Denton Liu1-1/+1
2019-05-15t3400: stop referring to the scripted rebaseLibravatar Johannes Schindelin1-1/+1
2019-04-16Merge branch 'ab/drop-scripted-rebase'Libravatar Junio C Hamano1-0/+16
2019-03-20rebase: remove the rebase.useBuiltin settingLibravatar Ævar Arnfjörð Bjarmason1-0/+16
2019-03-04built-in rebase: set ORIG_HEAD just once, before the rebaseLibravatar Johannes Schindelin1-1/+1
2019-03-04built-in rebase: demonstrate that ORIG_HEAD is not set correctlyLibravatar Johannes Schindelin1-0/+8
2018-10-07t/*: fix ordering of expected/observed argumentsLibravatar Matthew DeVore1-4/+4
2018-07-16t3000-t3999: fix broken &&-chainsLibravatar Eric Sunshine1-4/+4
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-02-12rebase: add --show-current-patchLibravatar Nguyễn Thái Ngọc Duy1-0/+33
2017-11-18rebase: use mboxrd format to avoid split errorsLibravatar Eric Wong1-0/+22
2016-06-17tests: unpack-trees: update to use test_i18n* functionsLibravatar Vasco Almeida1-2/+2
2014-07-16rebase: omit patch-identical commits with --fork-pointLibravatar John Keeping1-0/+23
2014-03-19rebase: allow "-" short-hand for the previous branchLibravatar Brian Gesiak1-0/+17
2014-01-09rebase: fix fork-point with zero argumentsLibravatar John Keeping1-2/+10
2013-12-10rebase: use reflog to find common base with upstreamLibravatar John Keeping1-2/+4
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Libravatar Junio C Hamano1-0/+11
2013-06-23Merge branch 'mz/rebase-tests'Libravatar Junio C Hamano1-52/+1
2013-06-20Merge branch 'fc/show-non-empty-errors-in-test'Libravatar Junio C Hamano1-1/+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-09test: test_must_be_empty helperLibravatar Junio C Hamano1-1/+1
2013-06-07tests: move test for rebase messages from t3400 to t3406Libravatar Martin von Zweigbergk1-22/+0
2013-06-07add tests for rebasing merged historyLibravatar Martin von Zweigbergk1-30/+1
2013-04-26Merge branch 'ph/rebase-original'Libravatar Junio C Hamano1-0/+7
2013-04-23rebase: find orig_head unambiguouslyLibravatar Phil Hord1-0/+7
2013-03-25t3400: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-2/+1
2012-07-25i18n: rebase: mark messages for translationLibravatar Jiang Xin1-4/+4
2012-03-04Make git-{pull,rebase} message without tracking information friendlierLibravatar Carlos Martín Nieto1-4/+2
2012-02-10Merge branch 'jc/parse-date-raw'Libravatar Junio C Hamano1-0/+23
2012-02-03parse_date(): '@' prefix forces git-timestampLibravatar Junio C Hamano1-0/+23
2011-12-08test: fix '&&' chainingLibravatar Ramkumar Ramachandra1-2/+2
2011-02-10rebase: use @{upstream} if no upstream specifiedLibravatar Martin von Zweigbergk1-9/+18
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-1/+2
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-1/+2
2010-07-23rebase: protect against diff.renames configurationLibravatar Junio C Hamano1-1/+23
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 03:27:20 +0000