summaryrefslogtreecommitdiffstats
path: root/builtin/merge-recursive.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai2024-09-131-1/+1
* builtin: add a repository parameter for builtin functionsJohn Cai2024-09-131-1/+4
* merge-recursive: honor diff.algorithmAntonin Delpeuch2024-07-141-1/+1
* builtin/merge-recursive: fix leaking object ID basesPatrick Steinhardt2024-06-111-4/+2
* treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-3/+0
* cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+0
* Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-101-0/+2
|\
| * hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren2023-04-241-0/+2
* | Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+2
|\|
| * object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
| * treewide: be explicit about dependence on advice.hElijah Newren2023-04-111-0/+1
| * Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-3/+3
| |\
* | | Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-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-3/+3
|\ \ \ | | |/ | |/|
| * | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+3
| |/
* / builtins: mark unused prefix parametersJeff King2023-03-281-1/+1
|/
* gettext API users: don't explicitly cast ngettext()'s "n"Ævar Arnfjörð Bjarmason2022-03-071-1/+1
* Ensure index matches head before invoking merge machinery, round NElijah Newren2019-08-191-0/+4
* Merge branch 'nd/the-index-final'Junio C Hamano2019-02-071-1/+1
|\
| * merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2019-01-141-1/+1
* | merge-recursive: copy $GITHEAD stringsJeff King2019-01-121-5/+10
|/
* builtin/merge-recursive: make hash independentbrian m. carlson2018-07-161-2/+2
* i18n: merge-recursive: mark verbose message for translationVasco Almeida2016-09-151-1/+1
* i18n: merge-recursive: mark error messages for translationVasco Almeida2016-09-151-7/+10
* merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-281-10/+10
* convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-251-1/+1
* replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-051-2/+2
* Fix sparse warningsStephen Boyd2011-03-221-1/+1
* Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-271-13/+2
|\
| * merge-recursive --patienceJustin Frankel2010-08-261-0/+1
| * merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-261-13/+1
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+4
|\|
| * merge-recursive --renormalizeJonathan Nieder2010-08-061-0/+4
* | builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-031-1/+4
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+84
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 19:39:15 +0100