summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-5/+5
* 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-061-1/+2
| * builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason2023-02-061-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-221-4/+6
* | merge: ensure we can actually restore pre-merge stateElijah Newren2022-07-221-5/+5
* | merge: make restore_state() restore staged state tooElijah Newren2022-07-221-3/+5
* | merge: fix save_state() to work when there are stat-dirty filesElijah Newren2022-07-221-0/+8
* | merge: do not abort early if one strategy fails to handle the mergeElijah Newren2022-07-221-2/+4
* | merge: abort if index does not match HEAD for trivial mergesElijah Newren2022-07-221-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-131-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
|\ \
| * | merge: fix memory leaks in cmd_merge()Elijah Newren2022-01-211-1/+5
* | | Merge branch 'ab/config-based-hooks-2'Junio C Hamano2022-02-091-1/+1
|\ \ \ | |/ / |/| |
| * | merge: convert post-merge to use hook.hEmily Shaffer2022-01-071-1/+1
* | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-2/+2
|\ \ \
| * | | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-2/+2
| |/ /
* | | Merge branch 'jc/merge-detached-head-name'Junio C Hamano2022-01-051-0/+4
|\ \ \ | |/ / |/| |
| * | merge: allow to pretend a merge is made into a different branchJunio C Hamano2021-12-201-0/+4
| |/
* | run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason2021-11-251-2/+1
|/
* Merge branch 'ab/mark-leak-free-tests-more'Junio C Hamano2021-10-251-0/+2
|\
| * merge: add missing strbuf_release()Ævar Arnfjörð Bjarmason2021-10-071-0/+2
* | Merge branch 'ab/config-based-hooks-1'Junio C Hamano2021-10-131-1/+2
|\ \
| * | hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason2021-09-271-1/+1
| * | hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason2021-09-271-0/+1
| |/
View Lorry Controller Status