aboutsummaryrefslogtreecommitdiff
path: root/builtin/rerere.c
Commit message (Expand)AuthorAge
* Merge branch 'js/merge-rr-fix'Junio C Hamano2010-07-15
|\
| * MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-14
| * Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-21
* | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-30
|\ \
| * | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-27
| |/
* | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-13
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22