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