aboutsummaryrefslogtreecommitdiffstats
path: root/t/t3400-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
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
2014-01-09rebase: fix fork-point with zero argumentsJohn Keeping1-2/+10
2013-12-10rebase: use reflog to find common base with upstreamJohn Keeping1-2/+4
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano1-0/+11
2013-06-23Merge branch 'mz/rebase-tests'Junio C Hamano1-52/+1
2013-06-20Merge branch 'fc/show-non-empty-errors-in-test'Junio C Hamano1-1/+1
2013-06-14rebase: use peel_committish() where appropriateRamkumar Ramachandra1-1/+1
2013-06-14t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra1-0/+11
2013-06-09test: test_must_be_empty helperJunio C Hamano1-1/+1
2013-06-07tests: move test for rebase messages from t3400 to t3406Martin von Zweigbergk1-22/+0
2013-06-07add tests for rebasing merged historyMartin von Zweigbergk1-30/+1
2013-04-26Merge branch 'ph/rebase-original'Junio C Hamano1-0/+7
2013-04-23rebase: find orig_head unambiguouslyPhil Hord1-0/+7
2013-03-25t3400: use test_config to set/unset git config variablesYann Droneaud1-2/+1
2012-07-25i18n: rebase: mark messages for translationJiang Xin1-4/+4
2012-03-04Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto1-4/+2
2012-02-10Merge branch 'jc/parse-date-raw'Junio C Hamano1-0/+23
2012-02-03parse_date(): '@' prefix forces git-timestampJunio C Hamano1-0/+23
2011-12-08test: fix '&&' chainingRamkumar Ramachandra1-2/+2
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk1-9/+18
2010-08-21Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-1/+2
2010-08-11unpack_trees: group error messages by typeMatthieu Moy1-1/+2
2010-07-23rebase: protect against diff.renames configurationJunio C Hamano1-1/+23
2010-07-23t3400 (rebase): whitespace cleanupJonathan Nieder1-90/+92
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano1-2/+7
2010-06-16am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian1-2/+7
2010-05-31rebase: improve error message when upstream argument is missingJonathan Nieder1-1/+12
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano1-0/+17
2010-03-12rebase: support automatic notes copyingThomas Rast1-0/+17
2010-01-25tests: consolidate CR removal/addition functionsStephen Boyd1-4/+0
2009-08-05Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano1-2/+24
2009-06-18am, rebase: teach quiet optionStephen Boyd1-6/+13
2009-05-24t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to CNguyễn Thái Ngọc Duy1-0/+31
2009-03-19test-lib: Introduce test_chmod and use it instead of update-index --chmodJohannes Sixt1-2/+2
2009-03-01t3400-rebase: Move detached HEAD check earlierJohannes Sixt1-4/+4
2009-02-08Add two extra tests for git rebaseJohannes Schindelin1-1/+12
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi1-3/+3
2008-05-14Merge branch 'bd/tests'Junio C Hamano1-1/+2
2008-05-13fix bsd shell negationJeff King1-2/+2
2008-05-05Don't use the 'export NAME=value' in the test scripts.Bryan Donlan1-1/+2
2008-02-01Sane use of test_expect_failureJunio C Hamano1-2/+2
2007-09-16apply --index-info: fall back to current index for mode changesJohannes Schindelin1-0/+15
2007-07-04Allow rebase to run if upstream is completely mergedJohannes Sixt1-1/+38
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-3/+3
2005-12-14git rebase loses author name/email if given bad email addressAmos Waterland1-0/+34
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 21:07:45 +0000