summaryrefslogtreecommitdiffstats
path: root/rerere.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-161-1/+1
|\
| * rerere: make rr-cache fanout directory honor umaskJunio C Hamano2012-07-101-1/+1
* | rerere: remove i18n legos in result messageNguyễn Thái Ngọc Duy2012-06-071-6/+6
|/
* Merge branch 'maint'Junio C Hamano2011-05-301-2/+8
|\
| * Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano2011-05-301-2/+8
| |\
| | * rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering2011-05-261-2/+8
* | | plug a DIR buffer leak in rerere.cJim Meyering2011-05-261-0/+1
* | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-081-0/+84
|/ /
* | sparse: Fix errors and silence warningsStephen Boyd2011-04-031-1/+1
* | Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano2011-03-271-2/+1
|\ \
| * | rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano2011-03-241-2/+1
* | | rerere "remaining"Martin von Zweigbergk2011-02-161-10/+68
| |/ |/|
* | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-271-1/+1
|\ \
| * | ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-1/+1
* | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+4
|\| |
| * | rerere: never renormalizeJonathan Nieder2010-08-061-6/+5
| * | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-061-5/+10
* | | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-09-011-1/+7
|\ \ \
| * | | rerere: fix overeager gcSZEDER Gábor2010-07-141-1/+7
* | | | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-051-5/+5
* | | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-301-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | string_list: Fix argument order for string_list_insertJulian Phillips2010-06-271-5/+5
| |/ /
* / / enums: omit trailing comma for portabilityGary V. Vaughan2010-06-011-1/+1
|/ /
* / ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-211-2/+2
|/
* rerere: fix memory leak if rerere images can't be readBert Wesarg2010-02-231-3/+6
* rerere: fix too-short initializationJeff King2010-01-281-1/+1
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-211-14/+46
|\
| * rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-171-2/+3
| * rerere: prepare for customizable conflict marker lengthJunio C Hamano2010-01-171-10/+44
| * rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano2010-01-171-4/+1
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-171-2/+2
* | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-201-42/+217
|\|
| * rerere forget path: forget recorded resolutionJunio C Hamano2010-01-111-0/+133
| * rerere: refactor rerere logic to make it independent from I/OJunio C Hamano2010-01-111-35/+76
| * rerere: remove silly 1024-byte line limitJunio C Hamano2009-12-261-9/+10
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-3/+5
|/
* use write_str_in_full helper to avoid literal string lengthsJim Meyering2009-09-131-1/+1
* replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-301-1/+1
* rerere: remove duplicated functionsSZEDER Gábor2009-02-151-11/+11
* Drop double-semicolon in CJunio C Hamano2009-02-111-1/+1
* Make some of fwrite/fclose/write/close failures visibleAlex Riesen2008-12-051-11/+35
* Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano2008-10-311-1/+1
|\
| * Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen2008-10-311-1/+1
* | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-221-1/+2
|\ \
| * | Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-191-1/+2
| |/
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-3/+1
* | fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre2008-10-031-5/+5
* | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-10/+19
|\ \
| * | rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-311-2/+8
| * | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-311-10/+13
| |/
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 00:23:04 +0100