Commit Graph

21 Commits (master)

Author SHA1 Message Date
Nguyễn Thái Ngọc Duy 55e6b3547d rerere.c: remove the_repository references 4 years ago
Nguyễn Thái Ngọc Duy 35843b1123 rerere.c: remove implicit dependency on the_index 4 years ago
Nguyễn Thái Ngọc Duy d2865daa39 rerere.h: drop extern from function declaration 4 years ago
Nguyễn Thái Ngọc Duy b475e442e8 completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate 5 years ago
Nguyễn Thái Ngọc Duy be3ce6b250 completion: use __gitcomp_builtin in _git_am 5 years ago
Junio C Hamano a13d13700b rerere: allow multiple variants to exist 7 years ago
Junio C Hamano 1869bbe1ce rerere: split conflict ID further 7 years ago
Jeff King 9dd330e6ca rerere: release lockfile in non-writing functions 7 years ago
Junio C Hamano 1d51eced10 rerere: use "struct rerere_id" instead of "char *" for conflict ID 7 years ago
Junio C Hamano 18bb99342f rerere: call conflict-ids IDs 7 years ago
Matthias Ruester 3424a02252 rerere.h: mark string for translation 8 years ago
Nguyễn Thái Ngọc Duy 01a10b0af9 rerere: convert to use parse_pathspec 9 years ago
Junio C Hamano 7e0d4ab585 rerere.c: mark private file-scope symbols as static 10 years ago
Junio C Hamano 0f891e7d7e rerere: libify rerere_clear() and rerere_gc() 12 years ago
Martin von Zweigbergk ac49f5ca84 rerere "remaining" 12 years ago
Junio C Hamano dea4562bf5 rerere forget path: forget recorded resolution 13 years ago
Junio C Hamano cb6020bb01 Teach --[no-]rerere-autoupdate option to merge, revert and friends 13 years ago
SZEDER Gábor 900569661b rerere: remove duplicated functions 14 years ago
Johannes Schindelin c455c87c5c Rename path_list to string_list 14 years ago
Stephan Beyer 5b2fd95606 rerere: Separate libgit and builtin functions 14 years ago