summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
Commit message (Expand)AuthorAgeFilesLines
* hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren2023-04-241-0/+1
* wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
* treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* diff: mark unused parameters in callbacksJeff King2022-12-131-1/+1
* doc txt & -h consistency: make "rerere" consistentÆvar Arnfjörð Bjarmason2022-10-131-1/+1
* doc txt & -h consistency: fix mismatching labelsÆvar Arnfjörð Bjarmason2022-10-131-1/+1
* xdiff users: use designated initializers for out_lineÆvar Arnfjörð Bjarmason2021-05-111-3/+1
* Merge branch 'nd/the-index'Junio C Hamano2019-01-041-4/+6
|\
| * rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-4/+6
* | Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-1/+2
|\ \ | |/ |/|
| * xdiff: provide a separate emit callback for hunksJeff King2018-11-021-1/+2
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-3/+3
|\ \
| * | rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+3
| |/
* | rerere: mark strings for translationThomas Gummerer2018-08-061-2/+2
* | rerere: wrap paths in output in sqThomas Gummerer2018-07-161-1/+1
|/
* avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-141-1/+1
* config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* Sync with 2.6.1Junio C Hamano2015-10-051-4/+6
|\
| * Sync with v2.5.4Junio C Hamano2015-09-281-4/+6
| |\
| | * Sync with 2.3.10Junio C Hamano2015-09-281-4/+6
| | |\
| | | * react to errors in xdi_diffJeff King2015-09-281-4/+6
* | | | Merge branch 'jc/rerere'Junio C Hamano2015-10-051-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-241-1/+1
| * | | rerere: call conflict-ids IDsJunio C Hamano2015-07-241-2/+2
| | |/ | |/|
* | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-9/+9
| |/ |/|
* | standardize usage info string formatAlex Henrie2015-01-141-1/+1
|/
* rerere: fix for merge.conflictstylefc/rerere-conflict-styleFelipe Contreras2014-04-301-0/+2
* rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-3/+5
* i18n: rerere: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-2/+2
* rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-081-75/+2
* rerere forget: deprecate invocation without pathspecJohannes Sixt2011-03-021-2/+5
* rerere "remaining"Martin von Zweigbergk2011-02-161-2/+12
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-24/+28
|\
| * rerere: migrate to parse-options APIJonathan Nieder2010-08-061-24/+28
* | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-08-311-5/+16
|\ \
| * | rerere: fix overeager gcSZEDER Gábor2010-07-141-5/+16
* | | Merge branch 'tf/string-list-init'Junio C Hamano2010-08-181-2/+2
|\ \ \
| * | | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-051-2/+2
* | | | Merge branch 'js/merge-rr-fix'Junio C Hamano2010-07-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-141-1/+1
| |/ /
| * | Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-1/+1
* | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-301-1/+1
|\ \ \ | |_|/ |/| |
| * | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-271-1/+1
| |/
* | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-1/+1
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+155
View Lorry Controller Status