summaryrefslogtreecommitdiffstats
path: root/rerere.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* / is_directory(): a generic helper functionJunio C Hamano2008-09-091-2/+1
|/
* Rename path_list to string_listJohannes Schindelin2008-07-221-20/+20
* rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano2008-07-171-2/+5
* Merge branch 'js/merge-rr'Junio C Hamano2008-07-151-1/+1
* rerere: Separate libgit and builtin functionsStephan Beyer2008-07-101-0/+360
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 08:29:33 +0100