Age | Commit message (Expand) | Author | Files | Lines |
2016-04-25 | Merge branch 'jc/rerere-multi' | Junio C Hamano | 1 | -1/+3 |
2016-03-15 | rerere: allow multiple variants to exist | Junio C Hamano | 1 | -0/+1 |
2016-02-08 | rerere: split conflict ID further | Junio C Hamano | 1 | -1/+2 |
2015-10-05 | Merge branch 'jc/rerere' | Junio C Hamano | 1 | -1/+11 |
2015-09-01 | rerere: release lockfile in non-writing functions | Jeff King | 1 | -0/+1 |
2015-07-24 | rerere: use "struct rerere_id" instead of "char *" for conflict ID | Junio C Hamano | 1 | -1/+11 |
2015-07-24 | rerere: call conflict-ids IDs | Junio C Hamano | 1 | -1/+1 |
2014-09-15 | rerere.h: mark string for translation | Matthias Ruester | 1 | -1/+1 |
2013-07-15 | rerere: convert to use parse_pathspec | Nguyễn Thái Ngọc Duy | 1 | -1/+3 |
2012-09-15 | rerere.c: mark private file-scope symbols as static | Junio C Hamano | 1 | -1/+0 |
2011-05-08 | rerere: libify rerere_clear() and rerere_gc() | Junio C Hamano | 1 | -0/+2 |
2011-02-16 | rerere "remaining" | Martin von Zweigbergk | 1 | -0/+8 |
2010-01-20 | Merge branch 'jc/cache-unmerge' | Junio C Hamano | 1 | -0/+1 |
2010-01-10 | rerere forget path: forget recorded resolution | Junio C Hamano | 1 | -0/+1 |
2009-12-04 | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 1 | -2/+8 |
2009-02-14 | rerere: remove duplicated functions | SZEDER Gábor | 1 | -0/+2 |
2008-07-21 | Rename path_list to string_list | Johannes Schindelin | 1 | -2/+2 |
2008-07-10 | rerere: Separate libgit and builtin functions | Stephan Beyer | 1 | -0/+9 |