summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* 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-061-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-111-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()cc/starts-n-ends-withChristian Couder2013-12-051-2/+2
* Fix sparse warningsStephen Boyd2011-03-221-1/+1
* Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-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
View Lorry Controller Status