Sign in
googlers
/
jrn
/
git
/
d4470c5a46f0fa965b1916308025d031545005fe
/
rerere.h
5b715ec
Merge branch 'jc/rerere-multi'
by Junio C Hamano
· 9 years ago
a13d137
rerere: allow multiple variants to exist
by Junio C Hamano
· 10 years ago
1869bbe
rerere: split conflict ID further
by Junio C Hamano
· 10 years ago
dc5400e
Merge branch 'jc/rerere'
by Junio C Hamano
· 9 years ago
9dd330e
rerere: release lockfile in non-writing functions
by Jeff King
· 10 years ago
1d51ece
rerere: use "struct rerere_id" instead of "char *" for conflict ID
by Junio C Hamano
· 10 years ago
18bb993
rerere: call conflict-ids IDs
by Junio C Hamano
· 10 years ago
3424a02
rerere.h: mark string for translation
by Matthias Ruester
· 10 years ago
01a10b0
rerere: convert to use parse_pathspec
by Nguyễn Thái Ngọc Duy
· 12 years ago
7e0d4ab
rerere.c: mark private file-scope symbols as static
by Junio C Hamano
· 12 years ago
0f891e7
rerere: libify rerere_clear() and rerere_gc()
by Junio C Hamano
· 14 years ago
ac49f5c
rerere "remaining"
by Martin von Zweigbergk
· 14 years ago
6751e04
Merge branch 'jc/cache-unmerge'
by Junio C Hamano
· 15 years ago
dea4562
rerere forget path: forget recorded resolution
by Junio C Hamano
· 15 years ago
cb6020b
Teach --[no-]rerere-autoupdate option to merge, revert and friends
by Junio C Hamano
· 15 years ago
9005696
rerere: remove duplicated functions
by SZEDER Gábor
· 16 years ago
c455c87
Rename path_list to string_list
by Johannes Schindelin
· 17 years ago
5b2fd95
rerere: Separate libgit and builtin functions
by Stephan Beyer
· 17 years ago