summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
AgeCommit message (Expand)Author
2021-05-11xdiff users: use designated initializers for out_lineÆvar Arnfjörð Bjarmason
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-02xdiff: provide a separate emit callback for hunksJeff King
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-06rerere: mark strings for translationThomas Gummerer
2018-07-16rerere: wrap paths in output in sqThomas Gummerer
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King
2017-06-15config: don't include config.h by defaultBrandon Williams
2015-10-05Sync with 2.6.1Junio C Hamano
2015-10-05Merge branch 'jc/rerere'Junio C Hamano
2015-09-29Sync with v2.5.4Junio C Hamano
2015-09-28Sync with 2.3.10Junio C Hamano
2015-09-28react to errors in xdi_diffJeff King
2015-09-01rerere: release lockfile in non-writing functionsJeff King
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano
2015-07-24rerere: call conflict-ids IDsJunio C Hamano
2015-01-14standardize usage info string formatAlex Henrie
2014-04-30rerere: fix for merge.conflictstyleFelipe Contreras
2013-07-15rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy
2012-08-20i18n: rerere: mark parseopt strings for translationNguyễn Thái Ngọc Duy
2011-05-08rerere: libify rerere_clear() and rerere_gc()Junio C Hamano
2011-03-02rerere forget: deprecate invocation without pathspecJohannes Sixt
2011-02-16rerere "remaining"Martin von Zweigbergk
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano
2010-08-18Merge branch 'tf/string-list-init'Junio C Hamano
2010-08-06rerere: migrate to parse-options APIJonathan Nieder
2010-07-15Merge branch 'js/merge-rr-fix'Junio C Hamano
2010-07-14MERGE_RR is in .git, not .git/rr-cacheJay Soffian
2010-07-14rerere: fix overeager gcSZEDER Gábor
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds