summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2019-01-04Merge branch 'nd/the-index'Libravatar Junio C Hamano1-4/+6
2018-11-13Merge branch 'jk/xdiff-interface'Libravatar Junio C Hamano1-1/+2
2018-11-12rerere.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-4/+6
2018-11-02xdiff: provide a separate emit callback for hunksLibravatar Jeff King1-1/+2
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-3/+3
2018-09-21rerere.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2018-08-06rerere: mark strings for translationLibravatar Thomas Gummerer1-2/+2
2018-07-16rerere: wrap paths in output in sqLibravatar Thomas Gummerer1-1/+1
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternLibravatar Jeff King1-1/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2015-10-05Sync with 2.6.1Libravatar Junio C Hamano1-4/+6
2015-10-05Merge branch 'jc/rerere'Libravatar Junio C Hamano1-2/+2
2015-09-28Sync with v2.5.4Libravatar Junio C Hamano1-4/+6
2015-09-28Sync with 2.3.10Libravatar Junio C Hamano1-4/+6
2015-09-28react to errors in xdi_diffLibravatar Jeff King1-4/+6
2015-09-01rerere: release lockfile in non-writing functionsLibravatar Jeff King1-9/+9
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDLibravatar Junio C Hamano1-1/+1
2015-07-24rerere: call conflict-ids IDsLibravatar Junio C Hamano1-2/+2
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-1/+1
2014-04-30rerere: fix for merge.conflictstyleLibravatar Felipe Contreras1-0/+2
2013-07-15rerere: convert to use parse_pathspecLibravatar Nguyễn Thái Ngọc Duy1-3/+5
2012-08-20i18n: rerere: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2011-05-08rerere: libify rerere_clear() and rerere_gc()Libravatar Junio C Hamano1-75/+2
2011-03-02rerere forget: deprecate invocation without pathspecLibravatar Johannes Sixt1-2/+5
2011-02-16rerere "remaining"Libravatar Martin von Zweigbergk1-2/+12
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-24/+28
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Libravatar Junio C Hamano1-5/+16
2010-08-18Merge branch 'tf/string-list-init'Libravatar Junio C Hamano1-2/+2
2010-08-06rerere: migrate to parse-options APILibravatar Jonathan Nieder1-24/+28
2010-07-15Merge branch 'js/merge-rr-fix'Libravatar Junio C Hamano1-1/+1
2010-07-14MERGE_RR is in .git, not .git/rr-cacheLibravatar Jay Soffian1-1/+1
2010-07-14rerere: fix overeager gcLibravatar SZEDER Gábor1-5/+16
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Libravatar Thiago Farina1-2/+2
2010-06-30Merge branch 'jp/string-list-api-cleanup'Libravatar Junio C Hamano1-1/+1
2010-06-27string_list: Fix argument order for string_list_appendLibravatar Julian Phillips1-1/+1
2010-06-21Merge branch 'rs/diff-no-minimal' into maintLibravatar Junio C Hamano1-1/+1
2010-06-13Merge branch 'rs/diff-no-minimal'Libravatar Junio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+155
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:25:25 +0000