summaryrefslogtreecommitdiff
path: root/branch.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy2019-05-131-3/+8
| |/
* | Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano2019-05-191-1/+1
|\ \
| * | branch: make create_branch accept a merge base revDenton Liu2019-05-071-1/+1
| |/
* | commit/reset: try to clean up sequencer statePhillip Wood2019-04-171-2/+2
|/
* branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-121-10/+11
* Merge branch 'ab/unconditional-free-and-null'Junio C Hamano2018-08-271-3/+1
|\
| * refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)Ævar Arnfjörð Bjarmason2018-08-171-3/+1
* | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-1/+1
* | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-7/+7
|\ \ | |/ |/|
| * path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-7/+7
* | refspec: rename struct refspec to struct refspec_itemBrandon Williams2018-05-181-3/+3
* | refspec: move refspec parsing logic into its own fileBrandon Williams2018-05-181-0/+1
|/
* Merge branch 'ks/branch-cleanup'Junio C Hamano2017-12-271-2/+2
|\
| * branch: group related arguments of create_branch()Kaartic Sivaraam2017-12-071-1/+1
| * branch: improve documentation and naming of create_branch() parametersKaartic Sivaraam2017-12-071-2/+2
* | Merge branch 'jc/branch-name-sanity'Junio C Hamano2017-11-281-14/+30
|\ \ | |/ |/|
| * branch: split validate_new_branchname() into twoJunio C Hamano2017-10-131-11/+23
| * branch: streamline "attr_only" handling in validate_new_branchname()Junio C Hamano2017-10-131-8/+12
* | refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-161-1/+1
* | refs: update ref transactions to use struct object_idbrian m. carlson2017-10-161-1/+1
|/
* refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-241-2/+1
* Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-09-101-2/+3
|\
| * branch: fix branch renaming not updating HEADs correctlynd/worktree-kill-parse-refNguyễn Thái Ngọc Duy2017-08-241-2/+3
* | branch: quote branch/ref names to improve readabilityks/branch-set-upstreamKaartic Sivaraam2017-08-171-8/+8
* | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\ \
| * | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ | |/ / |/| |
| * | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-8/+8
|\ \ \
| * | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | branch: convert to struct object_idbrian m. carlson2017-05-021-8/+8
| |/ /
* | | Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-05-161-7/+8
|\ \ \ | |/ / |/| / | |/
| * refs: kill set_worktree_head_symref()Nguyễn Thái Ngọc Duy2017-04-241-6/+6
| * worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()Nguyễn Thái Ngọc Duy2017-04-241-1/+2
* | create_branch: use xstrfmt for reflog messageJeff King2017-03-301-5/+4
* | create_branch: move msg setup closer to point of useJeff King2017-03-301-8/+9
|/
* branch: record creation of renamed branch in HEAD's logkm/delete-ref-reflog-messageKyle Meyer2017-02-201-2/+3
* refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-311-1/+1
* worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-281-1/+1
* create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-091-2/+1
* worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-221-2/+2
* worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-221-6/+7
View Lorry Controller Status