summaryrefslogtreecommitdiff
path: root/branch.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | worktree: simplify find_shared_symref() memory ownership modelAnders Kaseorg2021-12-011-6/+8
* | branch: lowercase error messagesAnders Kaseorg2021-12-011-10/+10
|/
* advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-251-1/+1
* Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-101-1/+1
|\
| * hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
* | Merge branch 'ah/plugleaks'Junio C Hamano2021-05-071-1/+1
|\ \
| * | branch: FREE_AND_NULL instead of NULL'ing real_refAndrzej Hunt2021-04-281-1/+1
| |/
* | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren2021-03-201-0/+1
|/
* wt-status: tolerate dangling marksJonathan Tan2020-09-021-1/+1
* Merge branch 'es/get-worktrees-unsort'Junio C Hamano2020-07-061-1/+1
|\
| * worktree: drop get_worktrees() unused 'flags' argumentEric Sunshine2020-06-221-1/+1
* | merge: teach --autostash optionDenton Liu2020-04-101-0/+1
|/
* Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-2/+2
|\
| * checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy2019-04-021-4/+7
* | Merge branch 'nd/merge-quit'Junio C Hamano2019-06-131-2/+7
|\ \
View Lorry Controller Status