summaryrefslogtreecommitdiff
path: root/branch.c
AgeCommit message (Expand)AuthorFilesLines
2023-03-19Merge branch 'rj/avoid-switching-to-already-used-branch'Junio C Hamano1-5/+9
2023-02-25branch: fix die_if_checked_out() when ignore_current_worktreeRubén Justo1-5/+9
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-01-18branch: improve advice when --recurse-submodules failsPhilippe Blain1-1/+1
2022-07-19branch: consider refs under 'update-refs'Derrick Stolee1-0/+13
2022-07-12Merge branch 'ds/branch-checked-out' into ds/rebase-update-refJunio C Hamano1-8/+68
2022-06-15branch: fix branch_checked_out() leaksDerrick Stolee1-10/+15
2022-06-15branch: check for bisects and rebasesDerrick Stolee1-8/+27
2022-06-15branch: add branch_checked_out() helperDerrick Stolee1-0/+36
2022-06-10Merge branch 'ab/env-array'Junio C Hamano1-1/+1
2022-06-02run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason1-1/+1
2022-05-26Merge branch 'tk/simple-autosetupmerge'Junio C Hamano1-1/+26
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-1/+1
2022-05-02Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocciJunio C Hamano1-1/+1
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano1-1/+1
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-1/+1
2022-04-29branch: new autosetupmerge option 'simple' for matching branchesTao Klerks1-1/+26
2022-04-04Merge branch 'tk/ambiguous-fetch-refspec'Junio C Hamano1-7/+56
2022-04-04Merge branch 'gc/branch-recurse-submodules-fix'Junio C Hamano1-12/+35
2022-04-01tracking branches: add advice to ambiguous refspec errorTao Klerks1-7/+56
2022-03-31branch.c: simplify advice-and-die sequenceGlen Choo1-7/+4
2022-03-31branch: rework comments for future developersGlen Choo1-2/+2
2022-03-30branch: remove negative exit codeGlen Choo1-1/+1
2022-03-30branch --set-upstream-to: be consistent when advisingGlen Choo1-2/+3
2022-03-30branch: give submodule updating advice before exitGlen Choo1-2/+4
2022-03-30branch: support more tracking modes when recursingGlen Choo1-3/+26
2022-02-18Merge branch 'gc/branch-recurse-submodules'Junio C Hamano1-43/+232
2022-02-04branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaksGlen Choo1-3/+4
2022-02-04branch: add --recurse-submodules option for branch creationGlen Choo1-0/+141
2022-02-01branch: add a dry_run parameter to create_branch()Glen Choo1-1/+4
2022-02-01branch: make create_branch() always create a branchGlen Choo1-29/+26
2022-02-01branch: move --set-upstream-to behavior to dwim_and_setup_tracking()Glen Choo1-20/+67
2022-01-12Merge branch 'ak/protect-any-current-branch'Junio C Hamano1-1/+1
2022-01-12branch: missing space fix at line 313Bagas Sanjaya1-1/+1
2022-01-10Merge branch 'js/branch-track-inherit'Junio C Hamano1-47/+145
2021-12-20branch: add flags and config to inherit trackingJosh Steadmon1-7/+42
2021-12-20branch: accept multiple upstream branches for trackingJosh Steadmon1-40/+103
2021-12-01branch: protect branches checked out in all worktreesAnders Kaseorg1-4/+9
2021-12-01worktree: simplify find_shared_symref() memory ownership modelAnders Kaseorg1-6/+8
2021-12-01branch: lowercase error messagesAnders Kaseorg1-10/+10
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-1/+1
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano1-1/+1
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano1-1/+1
2021-04-28branch: FREE_AND_NULL instead of NULL'ing real_refAndrzej Hunt1-1/+1
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-1/+1
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren1-0/+1
2020-09-02wt-status: tolerate dangling marksJonathan Tan1-1/+1
2020-07-06Merge branch 'es/get-worktrees-unsort'Junio C Hamano1-1/+1
2020-06-22worktree: drop get_worktrees() unused 'flags' argumentEric Sunshine1-1/+1
2020-04-10merge: teach --autostash optionDenton Liu1-0/+1