aboutsummaryrefslogtreecommitdiffstats
path: root/branch.c
AgeCommit message (Expand)AuthorFilesLines
10 daysMerge branch 'pf/commitish-committish'Junio C Hamano1-5/+5
2024-04-11typo: replace 'commitish' with 'committish'Pi Fisher1-5/+5
2024-03-05branch: advise about ref syntax rulesKristoffer Haugsbakk1-2/+6
2024-01-19refs: convert MERGE_AUTOSTASH to become a normal pseudo-refPatrick Steinhardt1-1/+1
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt1-1/+2
2024-01-02Merge branch 'rj/status-bisect-while-rebase'Junio C Hamano1-2/+2
2023-10-16status: fix branch shown when not only bisectingRubén Justo1-2/+2
2023-08-08branch: error message checking out a branch in useRubén Justo1-1/+1
2023-07-21branch: update the message to refuse touching a branch in-useJunio C Hamano1-1/+1
2023-06-29Merge branch 'en/header-split-cache-h-part-3'Junio C Hamano1-0/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-17branch: fix a leak in setup_trackingRubén Justo1-1/+1
2023-06-12branch: fix a leak in setup_trackingRubén Justo1-1/+1
2023-06-12branch: fix a leak in check_tracking_branchRubén Justo1-1/+4
2023-06-12branch: fix a leak in inherit_trackingRubén Justo1-1/+1
2023-06-12branch: fix a leak in dwim_and_setup_trackingRubén Justo1-1/+2
2023-05-15Merge branch 'rj/branch-unborn-in-other-worktrees'Junio C Hamano1-27/+0
2023-04-24hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren1-0/+1
2023-04-11treewide: remove cache.h inclusion due to object-name.h changesElijah Newren1-1/+0
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-3/+4
2023-03-28libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason1-4/+4
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-27branch: test for failures while renaming branchesRubén Justo1-27/+0
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
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-44/+233
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-30/+27
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
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-2/+2
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano1-2/+7
2019-05-19Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano1-1/+1
2019-05-13merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy1-3/+8
2019-05-07branch: make create_branch accept a merge base revDenton Liu1-1/+1
2019-04-17commit/reset: try to clean up sequencer statePhillip Wood1-2/+2
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy1-4/+7
2018-11-12branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy1-10/+11
2018-08-27Merge branch 'ab/unconditional-free-and-null'Junio C Hamano1-3/+1
2018-08-17refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)Ævar Arnfjörð Bjarmason1-3/+1
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-1/+1
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-7/+7
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-7/+7
2018-05-18refspec: rename struct refspec to struct refspec_itemBrandon Williams1-3/+3
2018-05-18refspec: move refspec parsing logic into its own fileBrandon Williams1-0/+1
2017-12-27Merge branch 'ks/branch-cleanup'Junio C Hamano1-2/+2
2017-12-07branch: group related arguments of create_branch()Kaartic Sivaraam1-1/+1
2017-12-07branch: improve documentation and naming of create_branch() parametersKaartic Sivaraam1-2/+2
2017-11-28Merge branch 'jc/branch-name-sanity'Junio C Hamano1-14/+30
2017-10-16refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson1-1/+1
2017-10-16refs: update ref transactions to use struct object_idbrian m. carlson1-1/+1
2017-10-13branch: split validate_new_branchname() into twoJunio C Hamano1-11/+23
2017-10-13branch: streamline "attr_only" handling in validate_new_branchname()Junio C Hamano1-8/+12
2017-09-24refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe1-2/+1
2017-09-10Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano1-2/+3
2017-08-24branch: fix branch renaming not updating HEADs correctlyNguyễn Thái Ngọc Duy1-2/+3
2017-08-17branch: quote branch/ref names to improve readabilityKaartic Sivaraam1-8/+8
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-8/+8
2017-05-16Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano1-7/+8
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-1/+1
2017-05-02branch: convert to struct object_idbrian m. carlson1-8/+8
2017-04-24refs: kill set_worktree_head_symref()Nguyễn Thái Ngọc Duy1-6/+6
2017-04-24worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()Nguyễn Thái Ngọc Duy1-1/+2
2017-03-30create_branch: use xstrfmt for reflog messageJeff King1-5/+4
2017-03-30create_branch: move msg setup closer to point of useJeff King1-8/+9
2017-02-20branch: record creation of renamed branch in HEAD's logKyle Meyer1-2/+3
2017-01-31refs: add option core.logAllRefUpdates = alwaysCornelius Weig1-1/+1
2016-11-28worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy1-1/+1
2016-11-09create_branch: drop unused "head" parameterJeff King1-2/+1
2016-04-22worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy1-2/+2
2016-04-22worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy1-6/+7
2016-04-22worktree.c: store "id" instead of "git_dir"Nguyễn Thái Ngọc Duy1-1/+2
2016-04-04branch -m: update all per-worktree HEADsKazuki Yamaguchi1-0/+23
2016-02-22config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt1-3/+3
2016-02-22branch: report errors in tracking branch setupPatrick Steinhardt1-14/+36
2015-11-20Remove get_object_hash.brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.brian m. carlson1-1/+1
2015-10-02worktree: add top-level worktree.cMichael Rappazzo1-78/+1
2015-08-25Merge branch 'dt/notes-multiple'Junio C Hamano1-12/+34
2015-08-19Merge branch 'jk/git-path'Junio C Hamano1-7/+7
2015-08-12Merge branch 'es/worktree-add-cleanup'Junio C Hamano1-0/+67
2015-08-11worktrees: add find_shared_symrefDavid Turner1-12/+34
2015-08-10memoize common git-path "constant" filesJeff King1-7/+7
2015-07-20branch: publish die_if_checked_out()Eric Sunshine1-0/+67
2015-02-17ref_transaction_update(): remove "have_old" parameterMichael Haggerty1-2/+3
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-1/+1
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg1-2/+2
2014-09-11Merge branch 'rs/ref-transaction-1'Junio C Hamano1-14/+17
2014-09-03branch.c: use ref transaction for all ref updatesRonnie Sahlberg1-14/+17
2014-08-07branch.c: replace `git_config()` with `git_config_get_string()Tanay Abhra1-20/+7
2014-08-07change `git_config()` return value to voidTanay Abhra1-4/+1
2014-06-20refactor skip_prefix to return a booleanJeff King1-2/+2
2014-03-31Merge branch 'an/branch-config-message'Junio C Hamano1-23/+23
2014-03-24branch.c: install_branch_config: simplify if chainAdam1-23/+23
2014-03-18Merge branch 'bg/install-branch-config-skip-prefix'Junio C Hamano1-9/+9
2014-03-18Merge branch 'jn/branch-lift-unnecessary-name-length-limit'Junio C Hamano1-4/+0
2014-03-06branch: use skip_prefix() in install_branch_config()Brian Gesiak1-9/+9
2014-03-05branch.c: delete size check of newly tracked branch namesJacopo Notarstefano1-4/+0
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-2/+2
2013-10-23Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano1-2/+1
2013-09-20Merge branch 'bk/refs-multi-update'Junio C Hamano1-1/+1
2013-09-20Merge branch 'jh/checkout-auto-tracking'Junio C Hamano1-2/+1
2013-09-09branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist1-2/+1
2013-08-30branch: trivial style fixFelipe Contreras1-1/+1
2013-08-30refs: report ref type from lock_any_ref_for_updateBrad King1-1/+1
2013-05-29Merge branch 'jh/checkout-auto-tracking'Junio C Hamano1-1/+16
2013-04-21branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland1-1/+16
2013-04-15i18n: branch: mark strings for translationJiang Xin1-27/+27
2013-04-02branch: give advice when tracking start-point is missingJeff King1-2/+17
2013-04-02branch: mention start_name in set-upstream error messagesJeff King1-5/+5
2013-04-02branch: improve error message for missing --set-upstream-to refJeff King1-1/+6
2013-04-02branch: factor out "upstream is not a branch" error messagesJeff King1-2/+5
2012-06-07Remove i18n legos in notifying new branch tracking setupNguyễn Thái Ngọc Duy1-15/+23
2012-03-26checkout: suppress tracking message with "-q"Jeff King1-4/+5
2011-12-19Merge branch 'nd/resolve-ref'Junio C Hamano1-1/+1
2011-12-19Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano1-2/+0
2011-12-13Merge branch 'jn/branch-move-to-self'Junio C Hamano1-2/+4
2011-12-13Rename resolve_ref() to resolve_ref_unsafe()Nguyễn Thái Ngọc Duy1-1/+1
2011-12-12Revert "reset: Make reset remove the sequencer state"Jonathan Nieder1-2/+0
2011-12-09Merge branch 'jc/request-pull-show-head-4'Junio C Hamano1-0/+31
2011-11-28Allow checkout -B <current-branch> to update the current branchJonathan Nieder1-2/+4
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder1-0/+1
2011-10-05branch: add read_branch_desc() helper functionJunio C Hamano1-0/+31
2011-10-05Merge branch 'rr/revert-cherry-pick-continue'Junio C Hamano1-0/+2
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano1-9/+12
2011-09-16branch --set-upstream: regression fixJunio C Hamano1-9/+12
2011-08-28Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano1-10/+24
2011-08-22Show interpreted branch name in error messagesConrad Irwin1-1/+1
2011-08-22Prevent force-updating of the current branchConrad Irwin1-10/+24
2011-08-19branch.c: use the parsed branch nameMichael J Gruber1-1/+1
2011-08-08reset: Make reset remove the sequencer stateRamkumar Ramachandra1-0/+2
2011-03-15Merge branch 'jh/maint-do-not-track-non-branches'Junio C Hamano1-3/+8
2011-02-21Introduce CHERRY_PICK_HEADJay Soffian1-0/+1
2011-02-16branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland1-3/+8
2010-08-09builtin/checkout: handle -B from detached HEAD correctlyTay Ray Chuan1-1/+1
2010-04-09Merge branch 'rc/maint-reflog-msg-for-forced-branch'Junio C Hamano1-1/+1
2010-01-18branch: warn and refuse to set a branch as a tracking branch of itself.Matthieu Moy1-2/+12
2010-01-18Add branch --set-upstreamIlari Liusvaara1-10/+21
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-2/+2
2009-03-22strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano1-4/+1
2009-03-22strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano1-6/+1
2009-03-22Rename interpret/substitute nth_last_branch functionsJunio C Hamano1-1/+1
2009-03-10Improve "git branch --tracking" outputJunio C Hamano1-6/+17
2009-03-03Make git-clone respect branch.autosetuprebaseJunio C Hamano1-16/+33
2009-02-13Teach the "@{-1} syntax to "git branch"Junio C Hamano1-5/+14
2008-10-21Merge branch 'jc/maint-co-track'Junio C Hamano1-1/+3
2008-10-17Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano1-1/+3
2008-10-03builtin-commit: use reduce_heads() only when appropriateMiklos Vajna1-0/+1
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 11:18:28 +0000