summaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-211-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-021-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-301-2/+8
| * | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-301-10/+13
| |/
* | is_directory(): a generic helper functionJunio C Hamano2008-09-091-2/+1
|/
* Rename path_list to string_listJohannes Schindelin2008-07-211-20/+20
* rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano2008-07-161-2/+5
* Merge branch 'js/merge-rr'Junio C Hamano2008-07-141-1/+1
* rerere: Separate libgit and builtin functionsStephan Beyer2008-07-101-0/+360
View Lorry Controller Status