summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2012-09-15rerere.c: mark private file-scope symbols as staticLibravatar Junio C Hamano1-1/+1
2012-07-15Merge branch 'ar/clone-honor-umask-at-top'Libravatar Junio C Hamano1-1/+1
2012-07-09rerere: make rr-cache fanout directory honor umaskLibravatar Junio C Hamano1-1/+1
2012-06-07rerere: remove i18n legos in result messageLibravatar Nguyễn Thái Ngọc Duy1-6/+6
2011-05-30Merge branch 'maint'Libravatar Junio C Hamano1-2/+8
2011-05-30Merge branch 'jm/maint-misc-fix' into maintLibravatar Junio C Hamano1-2/+8
2011-05-26plug a DIR buffer leak in rerere.cLibravatar Jim Meyering1-0/+1
2011-05-26rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Libravatar Jim Meyering1-2/+8
2011-05-08rerere: libify rerere_clear() and rerere_gc()Libravatar Junio C Hamano1-0/+84
2011-04-03sparse: Fix errors and silence warningsLibravatar Stephen Boyd1-1/+1
2011-03-26Merge branch 'jc/maint-rerere-in-workdir'Libravatar Junio C Hamano1-2/+1
2011-03-23rerere: make sure it works even in a workdir attached to a young repositoryLibravatar Junio C Hamano1-2/+1
2011-02-16rerere "remaining"Libravatar Martin von Zweigbergk1-10/+68
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-1/+1
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+4
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Libravatar Junio C Hamano1-1/+7
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder1-1/+1
2010-08-06rerere: never renormalizeLibravatar Jonathan Nieder1-6/+5
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-5/+10
2010-07-14rerere: fix overeager gcLibravatar SZEDER Gábor1-1/+7
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Libravatar Thiago Farina1-5/+5
2010-06-30Merge branch 'jp/string-list-api-cleanup'Libravatar Junio C Hamano1-5/+5
2010-06-27string_list: Fix argument order for string_list_insertLibravatar Julian Phillips1-5/+5
2010-05-31enums: omit trailing comma for portabilityLibravatar Gary V. Vaughan1-1/+1
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-2/+2
2010-02-23rerere: fix memory leak if rerere images can't be readLibravatar Bert Wesarg1-3/+6
2010-01-28rerere: fix too-short initializationLibravatar Jeff King1-1/+1
2010-01-20Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano1-14/+46
2010-01-20Merge branch 'jc/cache-unmerge'Libravatar Junio C Hamano1-42/+217
2010-01-17rerere: honor conflict-marker-size attributeLibravatar Junio C Hamano1-2/+3
2010-01-17rerere: prepare for customizable conflict marker lengthLibravatar Junio C Hamano1-10/+44
2010-01-16rerere: use ll_merge() instead of using xdl_merge()Libravatar Junio C Hamano1-4/+1
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersLibravatar Junio C Hamano1-2/+2
2010-01-10rerere forget path: forget recorded resolutionLibravatar Junio C Hamano1-0/+133
2010-01-10rerere: refactor rerere logic to make it independent from I/OLibravatar Junio C Hamano1-35/+76
2009-12-25rerere: remove silly 1024-byte line limitLibravatar Junio C Hamano1-9/+10
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-3/+5
2009-09-13use write_str_in_full helper to avoid literal string lengthsLibravatar Jim Meyering1-1/+1
2009-04-29replace direct calls to unlink(2) with unlink_or_warnLibravatar Alex Riesen1-1/+1
2009-02-14rerere: remove duplicated functionsLibravatar SZEDER Gábor1-11/+11
2009-02-10Drop double-semicolon in CLibravatar Junio C Hamano1-1/+1
2008-12-04Make some of fwrite/fclose/write/close failures visibleLibravatar Alex Riesen1-11/+35
2008-10-30Merge branch 'ar/maint-mksnpath' into ar/mksnpathLibravatar Junio C Hamano1-1/+1
2008-10-30Use git_pathdup instead of xstrdup(git_path(...))Libravatar Alex Riesen1-1/+1
2008-10-21Merge branch 'jc/maint-co-track'Libravatar Junio C Hamano1-1/+2
2008-10-19Enhance hold_lock_file_for_{update,append}() APILibravatar Junio C Hamano1-1/+2
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey1-3/+1
2008-10-02fix openssl headers conflicting with custom SHA1 implementationsLibravatar Nicolas Pitre1-5/+5
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-10/+19
2008-09-09is_directory(): a generic helper functionLibravatar Junio C Hamano1-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 09:20:39 +0000