summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+4
|\
| * wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
| * abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
| * environment: move comment_line_char from cache.hElijah Newren2023-03-211-0/+1
| * treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-9/+14
|\ \ | |/ |/|
| * cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| * cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| * cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+5
| * cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-5/+5
* | Merge branch 'jc/gpg-lazy-init'Junio C Hamano2023-03-171-3/+0
|\ \
| * | gpg-interface: lazily initialize and read the configurationJunio C Hamano2023-02-101-3/+0
* | | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
* | | alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-241-0/+1
| |/ |/|
* | Merge branch 'ab/various-leak-fixes'Junio C Hamano2023-02-221-8/+6
|\ \
| * | builtin/merge.c: free "&buf" on "Your local changes..." errorÆvar Arnfjörð Bjarmason2023-02-071-1/+2
| * | builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason2023-02-071-7/+4
| |/
* | cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason2023-02-101-3/+3
* | cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason2023-02-101-1/+1
|/
* merge: break out of all_strategy loop when strategy is foundSeija Kijin2023-01-131-1/+1
* Merge branch 'jk/unused-post-2.39'Junio C Hamano2022-12-261-1/+1
|\
| * diff: mark unused parameters in callbacksJeff King2022-12-131-1/+1
* | Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-0/+1
|\ \ | |/ |/|
| * {reset,merge}: call discard_index() before returningÆvar Arnfjörð Bjarmason2022-11-211-0/+1
* | cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason2022-11-211-7/+12
* | cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason2022-11-211-3/+3
* | cocci & cache.h: apply a selection of "pending" index-compatibilityÆvar Arnfjörð Bjarmason2022-11-211-1/+1
* | read-cache API & users: make discard_index() return voidÆvar Arnfjörð Bjarmason2022-11-211-1/+2
* | cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason2022-11-211-1/+1
* | use child_process members "args" and "env" directlyRené Scharfe2022-10-301-5/+5
* | use child_process member "args" instead of string array variableRené Scharfe2022-10-301-20/+12
* | merge: remove always-the-same "verbose" argumentsÆvar Arnfjörð Bjarmason2022-10-301-8/+5
|/
* Merge branch 'en/merge-multi-strategies'Junio C Hamano2022-09-011-9/+11
|\
| * merge: small code readability improvementElijah Newren2022-08-241-3/+3
| * merge: cleanup confusing logic for handling successful mergesElijah Newren2022-08-241-7/+9
* | Merge branch 'en/merge-unstash-only-on-clean-merge'Junio C Hamano2022-09-011-1/+4
|\ \ | |/ |/|
| * merge: only apply autostash when appropriateElijah Newren2022-08-241-1/+4
* | merge: do not exit restore_state() prematurelyElijah Newren2022-07-231-4/+6
* | merge: ensure we can actually restore pre-merge stateElijah Newren2022-07-231-5/+5
* | merge: make restore_state() restore staged state tooElijah Newren2022-07-231-3/+5
* | merge: fix save_state() to work when there are stat-dirty filesElijah Newren2022-07-231-0/+8
* | merge: do not abort early if one strategy fails to handle the mergeElijah Newren2022-07-231-2/+4
* | merge: abort if index does not match HEAD for trivial mergesElijah Newren2022-07-231-0/+15
* | cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason2022-07-061-4/+0
* | revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason2022-04-141-0/+2
|/
* hooks: fix an obscure TOCTOU "did we just run a hook?" raceÆvar Arnfjörð Bjarmason2022-03-071-4/+7
* merge: don't run post-hook logic on --no-verifyÆvar Arnfjörð Bjarmason2022-03-071-9/+12
* Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano2022-02-181-4/+2
|\
| * create_autostash(): remove unneeded parameterPhillip Wood2022-01-261-4/+2
* | Merge branch 'en/plug-leaks-in-merge'Junio C Hamano2022-02-091-1/+5
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 07:53:25 +0100