aboutsummaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2011-05-30
|\
| * Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano2011-05-30
| |\
| | * rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering2011-05-26
* | | plug a DIR buffer leak in rerere.cJim Meyering2011-05-26
* | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-08
|/ /
* | sparse: Fix errors and silence warningsStephen Boyd2011-04-03
* | Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano2011-03-26
|\ \
| * | rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano2011-03-23
* | | rerere "remaining"Martin von Zweigbergk2011-02-16
| |/ |/|
* | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-26
|\ \
| * | ll-merge: replace flag argument with options structJonathan Nieder2010-08-26
* | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\ \ \ | |/ /
| * | rerere: never renormalizeJonathan Nieder2010-08-06
| * | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-06
* | | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-08-31
|\ \ \
| * | | rerere: fix overeager gcSZEDER Gábor2010-07-14
* | | | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-05
* | | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-30
|\ \ \ \ | |_|/ / |/| | |
| * | | string_list: Fix argument order for string_list_insertJulian Phillips2010-06-27
| |/ /
* | | enums: omit trailing comma for portabilityGary V. Vaughan2010-05-31
|/ /
* | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-20
|/
* rerere: fix memory leak if rerere images can't be readBert Wesarg2010-02-23
* rerere: fix too-short initializationJeff King2010-01-28
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-17
| * rerere: prepare for customizable conflict marker lengthJunio C Hamano2010-01-17
| * rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano2010-01-16
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-20
|\ \ | |/
| * rerere forget path: forget recorded resolutionJunio C Hamano2010-01-10
| * rerere: refactor rerere logic to make it independent from I/OJunio C Hamano2010-01-10
| * rerere: remove silly 1024-byte line limitJunio C Hamano2009-12-25
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
|/
* use write_str_in_full helper to avoid literal string lengthsJim Meyering2009-09-13
* replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-29
* rerere: remove duplicated functionsSZEDER Gábor2009-02-14
* Drop double-semicolon in CJunio C Hamano2009-02-10
* Make some of fwrite/fclose/write/close failures visibleAlex Riesen2008-12-04
* Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano2008-10-30
|\
| * Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen2008-10-30
* | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-21
|\ \
| * | Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-19
| |/
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* | fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre2008-10-02
* | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \
| * | rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-30
| * | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-30
| |/
* | is_directory(): a generic helper functionJunio C Hamano2008-09-09
|/
* Rename path_list to string_listJohannes Schindelin2008-07-21
* rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano2008-07-16
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-01 14:58:09 +0000