summaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-3/+4
|\
| * convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
| * rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-4/+5
* | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-6/+6
|/
* rerere forget: do not segfault if not all stages are presentJohannes Sixt2013-04-041-8/+7
* rerere forget: grok files containing NULJohannes Sixt2013-04-021-2/+4
* rerere.c: mark private file-scope symbols as staticJunio C Hamano2012-09-151-1/+1
* Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-151-1/+1
|\
| * rerere: make rr-cache fanout directory honor umaskJunio C Hamano2012-07-091-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-261-2/+1
|\ \
| * | rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano2011-03-231-2/+1
* | | rerere "remaining"Martin von Zweigbergk2011-02-161-10/+68
| |/ |/|
* | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-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-08-311-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-05-311-1/+1
|/ /
* | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-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-201-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-161-4/+1
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-161-2/+2
* | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-201-42/+217
|\ \ | |/
| * rerere forget path: forget recorded resolutionJunio C Hamano2010-01-101-0/+133
| * rerere: refactor rerere logic to make it independent from I/OJunio C Hamano2010-01-101-35/+76
| * rerere: remove silly 1024-byte line limitJunio C Hamano2009-12-251-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-291-1/+1
* rerere: remove duplicated functionsSZEDER Gábor2009-02-141-11/+11
* Drop double-semicolon in CJunio C Hamano2009-02-101-1/+1
* Make some of fwrite/fclose/write/close failures visibleAlex Riesen2008-12-041-11/+35
* Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano2008-10-301-1/+1
|\
| * Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen2008-10-301-1/+1
View Lorry Controller Status