summaryrefslogtreecommitdiff
path: root/branch.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/branch-unborn-in-other-worktrees'Junio C Hamano2023-05-151-27/+0
|\
| * branch: test for failures while renaming branchesRubén Justo2023-03-271-27/+0
* | hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren2023-04-241-0/+1
* | treewide: remove cache.h inclusion due to object-name.h changesElijah Newren2023-04-111-1/+0
* | object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* | treewide: be explicit about dependence on advice.hElijah Newren2023-04-111-0/+1
* | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-3/+4
|\ \
| * | libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason2023-03-281-4/+4
| * | cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| * | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| |/
* | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
* | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | Merge branch 'rj/avoid-switching-to-already-used-branch'Junio C Hamano2023-03-191-5/+9
|\ \
| * | branch: fix die_if_checked_out() when ignore_current_worktreeRubén Justo2023-02-251-5/+9
* | | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
| |/ |/|
* | branch: improve advice when --recurse-submodules failsPhilippe Blain2023-01-181-1/+1
|/
* branch: consider refs under 'update-refs'Derrick Stolee2022-07-191-0/+13
* Merge branch 'ds/branch-checked-out' into ds/rebase-update-refJunio C Hamano2022-07-121-8/+68
|\
| * branch: fix branch_checked_out() leaksDerrick Stolee2022-06-151-10/+15
| * branch: check for bisects and rebasesDerrick Stolee2022-06-151-8/+27
| * branch: add branch_checked_out() helperDerrick Stolee2022-06-151-0/+36
* | Merge branch 'ab/env-array'Junio C Hamano2022-06-101-1/+1
|\ \
| * | run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason2022-06-021-1/+1
* | | Merge branch 'tk/simple-autosetupmerge'Junio C Hamano2022-05-261-1/+26
|\ \ \ | |_|/ |/| |
| * | branch: new autosetupmerge option 'simple' for matching branchesTao Klerks2022-04-291-1/+26
| |/
* | tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-1/+1
* | Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocciJunio C Hamano2022-05-021-1/+1
|\ \ | |/ |/|
| * Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-021-1/+1
| |\
| | * tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-1/+1
* | | Merge branch 'tk/ambiguous-fetch-refspec'Junio C Hamano2022-04-041-7/+56
|\ \ \
| * | | tracking branches: add advice to ambiguous refspec errorTao Klerks2022-04-011-7/+56
* | | | Merge branch 'gc/branch-recurse-submodules-fix'Junio C Hamano2022-04-041-12/+35
|\ \ \ \ | |/ / / |/| | |
| * | | branch.c: simplify advice-and-die sequenceGlen Choo2022-03-311-7/+4
| * | | branch: rework comments for future developersGlen Choo2022-03-311-2/+2
| * | | branch: remove negative exit codeGlen Choo2022-03-301-1/+1
| * | | branch --set-upstream-to: be consistent when advisingGlen Choo2022-03-301-2/+3
| * | | branch: give submodule updating advice before exitGlen Choo2022-03-301-2/+4
| * | | branch: support more tracking modes when recursingGlen Choo2022-03-301-3/+26
* | | | Merge branch 'gc/branch-recurse-submodules'Junio C Hamano2022-02-181-44/+233
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaksGlen Choo2022-02-041-3/+4
| * | branch: add --recurse-submodules option for branch creationGlen Choo2022-02-041-0/+141
| * | branch: add a dry_run parameter to create_branch()Glen Choo2022-02-011-1/+4
| * | branch: make create_branch() always create a branchGlen Choo2022-02-011-30/+27
| * | branch: move --set-upstream-to behavior to dwim_and_setup_tracking()Glen Choo2022-02-011-20/+67
* | | Merge branch 'ak/protect-any-current-branch'Junio C Hamano2022-01-121-1/+1
|\ \ \
| * | | branch: missing space fix at line 313Bagas Sanjaya2022-01-121-1/+1
* | | | Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-101-47/+145
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | branch: add flags and config to inherit trackingJosh Steadmon2021-12-201-7/+42
| * | branch: accept multiple upstream branches for trackingJosh Steadmon2021-12-201-40/+103
| |/
* | branch: protect branches checked out in all worktreesAnders Kaseorg2021-12-011-4/+9
View Lorry Controller Status