aboutsummaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAge
...
* 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
* Merge branch 'js/merge-rr'Junio C Hamano2008-07-14
* rerere: Separate libgit and builtin functionsStephan Beyer2008-07-10