aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-base.c
AgeCommit message (Expand)AuthorFilesLines
2025-07-23config: move Git config parsing into "environment.c"Patrick Steinhardt1-0/+1
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2024-12-27commit-reach: use `size_t` to track indices when computing merge basesPatrick Steinhardt1-2/+2
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-1/+1
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-1/+4
2024-02-29commit-reach(repo_get_merge_bases_many_dirty): pass on errorsJohannes Schindelin1-3/+6
2024-02-29commit-reach(get_octopus_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-2/+6
2024-02-28commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin1-1/+5
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-3/+0
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+0
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-4/+5
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+3
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+2
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2022-10-13doc txt & -h consistency: make output order consistentÆvar Arnfjörð Bjarmason1-1/+1
2022-03-04merge-base: free() allocated "struct commit **" listÆvar Arnfjörð Bjarmason1-1/+4
2022-02-04i18n: factorize more 'incompatible options' messagesJean-Noël Avila1-2/+4
2020-02-11rebase: --fork-point regression fixJunio C Hamano1-11/+1
2018-11-02Merge branch 'pk/rebase-in-c-4-opts'Junio C Hamano1-75/+6
2018-10-11merge-base --fork-point: extract libified functionPratik Karki1-75/+6
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-06-29commit: add repository argument to lookup_commitStefan Beller1-1/+1
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-2/+3
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano1-19/+21
2017-11-08reduce_heads: fix memory leaksMartin Ågren1-2/+4
2017-11-08builtin/merge-base: free commit listsMartin Ågren1-18/+18
2017-10-16refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson1-1/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-3/+3
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-3/+3
2017-04-27timestamp_t: a new data type for timestampsJohannes Schindelin1-1/+1
2017-02-22builtin/merge-base: convert to struct object_idbrian m. carlson1-14/+14
2017-02-22refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson1-3/+3
2016-10-12merge-base: handle --fork-point without reflogJeff King1-0/+3
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King1-1/+1
2015-11-20Convert struct object to object_idbrian m. carlson1-4/+4
2015-01-14standardize usage info string formatAlex Henrie1-2/+2
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano1-2/+2
2014-01-10Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano1-6/+26
2013-12-30merge-base --octopus: reduce the result from get_octopus_merge_bases()Junio C Hamano1-1/+1
2013-12-30merge-base: separate "--independent" codepath into its own helperJunio C Hamano1-6/+25
2013-10-29merge-base: teach "--fork-point" modeJunio C Hamano1-0/+109
2013-10-23merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano1-16/+22
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller1-5/+5
2013-06-13use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe1-1/+1
2012-09-11Merge branch 'jc/merge-bases'Junio C Hamano1-0/+22
2012-08-31merge-base: "--is-ancestor A B"Junio C Hamano1-0/+22
2012-08-20i18n: merge-base: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-6/+6
2011-04-15Documentation: update to git-merge-base --octopusVincent van Ravesteijn1-1/+2
2010-08-18merge-base --independent to print reduced parent list in a mergeJonathan Nieder1-6/+15
2010-08-18merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder1-3/+32
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+63