summaryrefslogtreecommitdiff
path: root/branch.c
AgeCommit message (Expand)Author
2022-06-10Merge branch 'ab/env-array'Junio C Hamano
2022-06-02run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason
2022-05-26Merge branch 'tk/simple-autosetupmerge'Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-05-02Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocciJunio C Hamano
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-04-29branch: new autosetupmerge option 'simple' for matching branchesTao Klerks
2022-04-04Merge branch 'tk/ambiguous-fetch-refspec'Junio C Hamano
2022-04-04Merge branch 'gc/branch-recurse-submodules-fix'Junio C Hamano
2022-04-01tracking branches: add advice to ambiguous refspec errorTao Klerks
2022-03-31branch.c: simplify advice-and-die sequenceGlen Choo
2022-03-31branch: rework comments for future developersGlen Choo
2022-03-30branch: remove negative exit codeGlen Choo
2022-03-30branch --set-upstream-to: be consistent when advisingGlen Choo
2022-03-30branch: give submodule updating advice before exitGlen Choo
2022-03-30branch: support more tracking modes when recursingGlen Choo
2022-02-18Merge branch 'gc/branch-recurse-submodules'Junio C Hamano
2022-02-04branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaksGlen Choo
2022-02-04branch: add --recurse-submodules option for branch creationGlen Choo
2022-02-01branch: add a dry_run parameter to create_branch()Glen Choo
2022-02-01branch: make create_branch() always create a branchGlen Choo
2022-02-01branch: move --set-upstream-to behavior to dwim_and_setup_tracking()Glen Choo
2022-01-12Merge branch 'ak/protect-any-current-branch'Junio C Hamano
2022-01-12branch: missing space fix at line 313Bagas Sanjaya
2022-01-10Merge branch 'js/branch-track-inherit'Junio C Hamano
2021-12-21branch: add flags and config to inherit trackingJosh Steadmon
2021-12-21branch: accept multiple upstream branches for trackingJosh Steadmon
2021-12-02branch: protect branches checked out in all worktreesAnders Kaseorg
2021-12-02worktree: simplify find_shared_symref() memory ownership modelAnders Kaseorg
2021-12-02branch: lowercase error messagesAnders Kaseorg
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano
2021-04-28branch: FREE_AND_NULL instead of NULL'ing real_refAndrzej Hunt
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren
2020-09-02wt-status: tolerate dangling marksJonathan Tan
2020-07-07Merge branch 'es/get-worktrees-unsort'Junio C Hamano
2020-06-22worktree: drop get_worktrees() unused 'flags' argumentEric Sunshine
2020-04-10merge: teach --autostash optionDenton Liu
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano
2019-05-19Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano
2019-05-13merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy
2019-05-07branch: make create_branch accept a merge base revDenton Liu
2019-04-17commit/reset: try to clean up sequencer statePhillip Wood
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy
2018-11-12branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy
2018-08-27Merge branch 'ab/unconditional-free-and-null'Junio C Hamano