aboutsummaryrefslogtreecommitdiffstats
path: root/t/t3400-rebase.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-12-06Merge branch 'kh/sequencer-comment-char'Junio C Hamano1-0/+19
2024-11-26sequencer: comment checked-out branch properlyKristoffer Haugsbakk1-0/+19
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-09-20Merge branch 'pw/rebase-autostash-fix'Junio C Hamano1-2/+6
2024-09-03rebase: apply and cleanup autostash when rebase fails to startPhillip Wood1-2/+6
2024-08-21rebase --exec: respect --quietMatheus Tavares1-0/+6
2024-06-11notes-utils: free note trees when releasing copied notesPatrick Steinhardt1-0/+1
2024-02-15t: move tests exercising the "files" backendPatrick Steinhardt1-10/+0
2023-12-09Merge branch 'ps/ref-tests-update'Junio C Hamano1-1/+1
2023-11-08Merge branch 'jc/test-i18ngrep'Junio C Hamano1-3/+3
2023-11-03t: mark several tests that assume the files backend with REFFILESPatrick Steinhardt1-1/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-3/+3
2023-08-08branch: error message checking out a branch in useRubén Justo1-1/+1
2023-02-25rebase: refuse to switch to a branch already checked out elsewhere (test)Rubén Justo1-0/+14
2022-03-18rebase: set REF_HEAD_DETACH in checkout_up_to_date()John Cai1-0/+9
2022-03-18rebase: use test_commit helper in setupJohn Cai1-7/+2
2022-01-26sequencer, stash: fix running from worktree subdirElijah Newren1-0/+21
2021-08-02mingw: align symlinks-related rmdir() behavior with LinuxThomas Bétous1-0/+10
2021-03-23rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason1-16/+0
2021-02-10tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason1-1/+1
2020-11-19t34*: adjust the references to the default branch name "main"Johannes Schindelin1-31/+31
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-03-05Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano1-1/+19
2020-02-24rebase: refuse to switch to branch already checked out elsewhereEric Sunshine1-0/+18
2020-02-24t3400: make test clean up after itselfEric Sunshine1-1/+1
2020-02-16rebase: rename the two primary rebase backendsElijah Newren1-8/+8
2020-02-16rebase tests: mark tests specific to the am-backend with --amElijah Newren1-5/+5
2020-02-16rebase: fix handling of restrict_revisionElijah Newren1-1/+19
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerElijah Newren1-1/+7
2019-12-16Merge branch 'dl/rebase-with-autobase'Junio C Hamano1-0/+6
2019-12-05rebase: fix format.useAutoBase breakageDenton Liu1-1/+1
2019-12-05t3400: demonstrate failure with format.useAutoBaseDenton Liu1-0/+6
2019-11-21t: teach test_cmp_rev to accept ! for not-equalsDenton Liu1-1/+1
2019-09-30Merge branch 'dl/rebase-i-keep-base'Junio C Hamano1-1/+1
2019-09-09Merge branch 'bc/reread-attributes-during-rebase'Junio C Hamano1-0/+36
2019-09-03am: reload .gitattributes after patching itbrian m. carlson1-0/+36
2019-08-27rebase: fast-forward --onto in more casesDenton Liu1-1/+1
2019-05-15t3400: stop referring to the scripted rebaseJohannes Schindelin1-1/+1
2019-04-16Merge branch 'ab/drop-scripted-rebase'Junio C Hamano1-0/+16
2019-03-20rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason1-0/+16
2019-03-04built-in rebase: set ORIG_HEAD just once, before the rebaseJohannes Schindelin1-1/+1
2019-03-04built-in rebase: demonstrate that ORIG_HEAD is not set correctlyJohannes Schindelin1-0/+8
2018-10-07t/*: fix ordering of expected/observed argumentsMatthew DeVore1-4/+4
2018-07-16t3000-t3999: fix broken &&-chainsEric Sunshine1-4/+4
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy1-1/+2
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy1-0/+33
2017-11-18rebase: use mboxrd format to avoid split errorsEric Wong1-0/+22
2016-06-17tests: unpack-trees: update to use test_i18n* functionsVasco Almeida1-2/+2
2014-07-16rebase: omit patch-identical commits with --fork-pointJohn Keeping1-0/+23
2014-03-19rebase: allow "-" short-hand for the previous branchBrian Gesiak1-0/+17