path: root/rerere.c
AgeCommit message (Expand)Author
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-02-23rerere: fix memory leak if rerere images can't be readBert Wesarg
2010-01-28rerere: fix too-short initializationJeff King
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano
2010-01-17rerere: honor conflict-marker-size attributeJunio C Hamano
2010-01-17rerere: prepare for customizable conflict marker lengthJunio C Hamano
2010-01-17rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2010-01-11rerere forget path: forget recorded resolutionJunio C Hamano
2010-01-11rerere: refactor rerere logic to make it independent from I/OJunio C Hamano
2009-12-26rerere: remove silly 1024-byte line limitJunio C Hamano
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano
2009-09-13use write_str_in_full helper to avoid literal string lengthsJim Meyering
2009-04-30replace direct calls to unlink(2) with unlink_or_warnAlex Riesen
2009-02-15rerere: remove duplicated functionsSZEDER Gábor
2009-02-11Drop double-semicolon in CJunio C Hamano
2008-12-05Make some of fwrite/fclose/write/close failures visibleAlex Riesen
2008-10-31Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano
2008-10-31Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen
2008-10-22Merge branch 'jc/maint-co-track'Junio C Hamano
2008-10-19Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-10-03fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-09is_directory(): a generic helper functionJunio C Hamano
2008-08-31rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano
2008-08-31rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano
2008-07-22Rename path_list to string_listJohannes Schindelin
2008-07-17rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano
2008-07-15Merge branch 'js/merge-rr'Junio C Hamano
2008-07-10rerere: Separate libgit and builtin functionsStephan Beyer