summaryrefslogtreecommitdiffstats
path: root/t/t3400-rebase.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* notes-utils: free note trees when releasing copied notesPatrick Steinhardt2024-06-111-0/+1
* t: move tests exercising the "files" backendPatrick Steinhardt2024-02-151-10/+0
* Merge branch 'ps/ref-tests-update'Junio C Hamano2023-12-101-1/+1
|\
| * t: mark several tests that assume the files backend with REFFILESPatrick Steinhardt2023-11-031-1/+1
* | Merge branch 'jc/test-i18ngrep'Junio C Hamano2023-11-081-3/+3
|\ \ | |/ |/|
| * tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano2023-11-021-3/+3
* | branch: error message checking out a branch in useRubén Justo2023-08-091-1/+1
|/
* rebase: refuse to switch to a branch already checked out elsewhere (test)Rubén Justo2023-02-251-0/+14
* rebase: set REF_HEAD_DETACH in checkout_up_to_date()John Cai2022-03-181-0/+9
* rebase: use test_commit helper in setupJohn Cai2022-03-181-7/+2
* sequencer, stash: fix running from worktree subdirElijah Newren2022-01-261-0/+21
* mingw: align symlinks-related rmdir() behavior with LinuxThomas Bétous2021-08-031-0/+10
* rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason2021-03-231-16/+0
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-111-1/+1
* t34*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-31/+31
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano2020-03-051-1/+19
|\
| * rebase: refuse to switch to branch already checked out elsewhereEric Sunshine2020-02-241-0/+18
| * t3400: make test clean up after itselfEric Sunshine2020-02-241-1/+1
* | rebase: rename the two primary rebase backendsElijah Newren2020-02-171-8/+8
* | rebase tests: mark tests specific to the am-backend with --amElijah Newren2020-02-171-5/+5
* | rebase: fix handling of restrict_revisionElijah Newren2020-02-171-1/+19
* | rebase: make sure to pass along the quiet flag to the sequencerElijah Newren2020-02-171-1/+7
|/
* Merge branch 'dl/rebase-with-autobase'Junio C Hamano2019-12-161-0/+6
|\
| * rebase: fix format.useAutoBase breakageDenton Liu2019-12-051-1/+1
| * t3400: demonstrate failure with format.useAutoBaseDenton Liu2019-12-051-0/+6
* | t: teach test_cmp_rev to accept ! for not-equalsDenton Liu2019-11-211-1/+1
|/
* Merge branch 'dl/rebase-i-keep-base'Junio C Hamano2019-09-301-1/+1
|\
| * rebase: fast-forward --onto in more casesDenton Liu2019-08-281-1/+1
* | Merge branch 'bc/reread-attributes-during-rebase'Junio C Hamano2019-09-091-0/+36
|\ \ | |/ |/|
| * am: reload .gitattributes after patching itbrian m. carlson2019-09-041-0/+36
* | t3400: stop referring to the scripted rebaseJohannes Schindelin2019-05-151-1/+1
|/
* Merge branch 'ab/drop-scripted-rebase'Junio C Hamano2019-04-161-0/+16
|\
| * rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason2019-03-201-0/+16
* | built-in rebase: set ORIG_HEAD just once, before the rebaseJohannes Schindelin2019-03-041-1/+1
* | built-in rebase: demonstrate that ORIG_HEAD is not set correctlyJohannes Schindelin2019-03-041-0/+8
|/
* t/*: fix ordering of expected/observed argumentsMatthew DeVore2018-10-071-4/+4
* t3000-t3999: fix broken &&-chainsEric Sunshine2018-07-161-4/+4
* rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy2018-02-121-1/+2
* rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+33
* rebase: use mboxrd format to avoid split errorsEric Wong2017-11-181-0/+22
* tests: unpack-trees: update to use test_i18n* functionsVasco Almeida2016-06-181-2/+2
* rebase: omit patch-identical commits with --fork-pointJohn Keeping2014-07-161-0/+23
* rebase: allow "-" short-hand for the previous branchBrian Gesiak2014-03-191-0/+17
* rebase: fix fork-point with zero argumentsJohn Keeping2014-01-101-2/+10
* rebase: use reflog to find common base with upstreamJohn Keeping2013-12-101-2/+4
* Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-241-0/+11
|\
| * rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-141-1/+1
| * t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-141-0/+11
* | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-231-52/+1
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 19:33:59 +0100