summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/branch-unborn-in-other-worktrees'Junio C Hamano2023-05-151-0/+29
|\
| * branch: rename orphan branches in any worktreeRubén Justo2023-03-271-0/+14
| * branch: test for failures while renaming branchesRubén Justo2023-03-271-0/+15
* | tests: don't lose exit status with "(cd ...; test <op> $(git ...))"Ævar Arnfjörð Bjarmason2023-02-061-2/+6
|/
* branch: gracefully handle '-d' on orphan HEADJeff King2022-11-101-0/+36
* Merge branch 'rj/branch-do-not-exit-with-minus-one-status'Taylor Blau2022-10-301-1/+1
|\
| * branch: error code with --edit-descriptionRubén Justo2022-10-261-1/+1
* | branch: error copying or renaming a detached HEADRubén Justo2022-10-261-0/+11
|/
* Sync with v2.38.1Junio C Hamano2022-10-171-0/+1
|\
| * Sync with 2.36.3Taylor Blau2022-10-061-0/+1
| |\
| | * Sync with 2.35.5Taylor Blau2022-10-061-0/+1
| | |\
| | | * Sync with 2.34.5Taylor Blau2022-10-061-0/+1
| | | |\
| | | | * Sync with 2.32.4Taylor Blau2022-10-061-0/+1
| | | | |\
| | | | | * Sync with 2.30.6Taylor Blau2022-10-061-0/+1
| | | | | |\
| | | | | | * t/t3NNN: allow local submodulesTaylor Blau2022-10-011-0/+1
* | | | | | | Merge branch 'jc/branch-description-unset'Junio C Hamano2022-10-171-0/+3
|\ \ \ \ \ \ \
| * | | | | | | branch: do not fail a no-op --edit-descJunio C Hamano2022-09-301-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | t: remove \{m,n\} from BRE grep usageĐoàn Trần Công Danh2022-09-211-2/+2
| |/ / / / / |/| | | | |
* | | | | | branch: new autosetupmerge option 'simple' for matching branchesTao Klerks2022-04-291-0/+35
| |/ / / / |/| | | |
* | | | | tracking branches: add advice to ambiguous refspec errorTao Klerks2022-04-011-2/+16
* | | | | Merge branch 'gc/branch-recurse-submodules'Junio C Hamano2022-02-181-0/+17
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | branch: make create_branch() always create a branchGlen Choo2022-02-011-0/+17
| * | | | Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodulesJunio C Hamano2022-01-311-3/+36
| |\ \ \ \
* | \ \ \ \ Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-101-3/+36
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | branch: add flags and config to inherit trackingJosh Steadmon2021-12-201-0/+33
| * | | | | branch: accept multiple upstream branches for trackingJosh Steadmon2021-12-201-3/+3
| | |_|/ / | |/| | |
* | | | | branch: protect branches checked out in all worktreesAnders Kaseorg2021-12-011-0/+7
* | | | | branch: lowercase error messagesAnders Kaseorg2021-12-011-2/+2
| |/ / / |/| | |
* | | | Merge branch 'jc/fix-ref-sorting-parse'Junio C Hamano2021-11-291-1/+11
|\ \ \ \
| * | | | for-each-ref: delay parsing of --sort=<atom> optionsJunio C Hamano2021-10-201-1/+11
| |/ / /
* | | | branch tests: test for errno propagating on failing readHan-Wen Nienhuys2021-10-161-0/+22
|/ / /
* | | branch: allow deleting dangling branches with --forceRené Scharfe2021-08-271-0/+13
| |/ |/|
* | tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-13/+13
* | Merge branch 'js/default-branch-name-tests-final-stretch'Junio C Hamano2021-01-251-0/+3
|\ \
| * | tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer neededJohannes Schindelin2020-11-191-3/+3
| * | t3[0-3]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-122/+122
| * | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* | | Merge branch 'ew/decline-core-abbrev'Junio C Hamano2021-01-151-0/+2
|\ \ \ | |_|/ |/| |
| * | core.abbrev=no disables abbreviationsEric Wong2020-12-231-0/+2
* | | t3200: finish transitioning to the initial branch name `main`Johannes Schindelin2020-12-161-132/+133
| |/ |/|
* | tests: prepare aligned mentions of the default branch nameJohannes Schindelin2020-10-231-6/+6
* | t3200: prepare for `main` being shorter than `master`Johannes Schindelin2020-10-231-2/+2
* | Merge branch 'js/default-branch-name-part-2'Junio C Hamano2020-10-051-17/+17
|\ \
| * | t3200: avoid variations of the `master` branch nameJohannes Schindelin2020-09-211-17/+17
* | | Merge branch 'al/ref-filter-merged-and-no-merged'Junio C Hamano2020-09-221-4/+0
|\ \ \ | |/ / |/| |
| * | ref-filter: allow merged and no-merged filtersAaron Lipman2020-09-161-4/+0
| |/
* | t3200: clean side effect of git checkout --orphanAaron Lipman2020-09-081-0/+1
|/
* Merge branch 'dl/branch-cleanup' into masterJunio C Hamano2020-07-181-2/+2
|\
| * t3200: don't grep for `strerror()` stringMartin Ågren2020-07-181-2/+2
* | Merge branch 'bc/sha-256-part-2'Junio C Hamano2020-07-061-1/+1
|\ \ | |/ |/|