summaryrefslogtreecommitdiffstats
path: root/branch.c (follow)
Commit message (Expand)AuthorAgeLines
* branch: protect branches checked out in all worktreesAnders Kaseorg2021-12-01-4/+9
* worktree: simplify find_shared_symref() memory ownership modelAnders Kaseorg2021-12-01-6/+8
* branch: lowercase error messagesAnders Kaseorg2021-12-01-10/+10
* advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-25-1/+1
* Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-10-1/+1
|\
| * hash: provide per-algorithm null OIDsbrian m. carlson2021-04-27-1/+1
* | Merge branch 'ah/plugleaks'Junio C Hamano2021-05-07-1/+1
|\ \
| * | branch: FREE_AND_NULL instead of NULL'ing real_refAndrzej Hunt2021-04-28-1/+1
| |/
* / merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren2021-03-20-0/+1
|/
* wt-status: tolerate dangling marksJonathan Tan2020-09-02-1/+1
* Merge branch 'es/get-worktrees-unsort'Junio C Hamano2020-07-06-1/+1
|\
| * worktree: drop get_worktrees() unused 'flags' argumentEric Sunshine2020-06-22-1/+1
* | merge: teach --autostash optionDenton Liu2020-04-10-0/+1
|/
* Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-09-2/+2
|\
| * checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy2019-04-02-4/+7
* | Merge branch 'nd/merge-quit'Junio C Hamano2019-06-13-2/+7
|\ \
| * | merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy2019-05-13-3/+8
| |/
* | Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano2019-05-19-1/+1
|\ \
| * | branch: make create_branch accept a merge base revDenton Liu2019-05-07-1/+1
| |/
* / commit/reset: try to clean up sequencer statePhillip Wood2019-04-17-2/+2
|/
* branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-12-10/+11
* Merge branch 'ab/unconditional-free-and-null'Junio C Hamano2018-08-27-3/+1
|\
| * refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)Ævar Arnfjörð Bjarmason2018-08-17-3/+1
* | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-29-1/+1
* | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-29-7/+7
|\ \ | |/ |/|
| * path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-18-7/+7
* | refspec: rename struct refspec to struct refspec_itemBrandon Williams2018-05-18-3/+3
* | refspec: move refspec parsing logic into its own fileBrandon Williams2018-05-18-0/+1
|/
* Merge branch 'ks/branch-cleanup'Junio C Hamano2017-12-27-2/+2
|\
| * branch: group related arguments of create_branch()Kaartic Sivaraam2017-12-07-1/+1
| * branch: improve documentation and naming of create_branch() parametersKaartic Sivaraam2017-12-07-2/+2
* | Merge branch 'jc/branch-name-sanity'Junio C Hamano2017-11-28-14/+30
|\ \ | |/ |/|
| * branch: split validate_new_branchname() into twoJunio C Hamano2017-10-13-11/+23
| * branch: streamline "attr_only" handling in validate_new_branchname()Junio C Hamano2017-10-13-8/+12
* | refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-16-1/+1
* | refs: update ref transactions to use struct object_idbrian m. carlson2017-10-16-1/+1
|/
* refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-24-2/+1
* Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-09-10-2/+3
|\
| * branch: fix branch renaming not updating HEADs correctlyNguyễn Thái Ngọc Duy2017-08-24-2/+3
* | branch: quote branch/ref names to improve readabilityKaartic Sivaraam2017-08-17-8/+8
* | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-24-2/+1
|\ \
| * | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-16-2/+1
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24-0/+1
|\ \ \ | |/ / |/| |
| * | config: don't include config.h by defaultBrandon Williams2017-06-15-0/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-29-8/+8
|\ \ \
| * | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08-1/+1
| * | | branch: convert to struct object_idbrian m. carlson2017-05-02-8/+8
| |/ /
* | | Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-05-16-7/+8
|\ \ \ | |/ / |/| / | |/
| * refs: kill set_worktree_head_symref()Nguyễn Thái Ngọc Duy2017-04-24-6/+6
| * worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()Nguyễn Thái Ngọc Duy2017-04-24-1/+2