Sign in
googlers
/
jrn
/
git
/
4d25dc4475639395b4c567d947218613de359f09
/
merge.c
697cc8e
lockfile.h: extract new header file for the functions in lockfile.c
by Michael Haggerty
· 10 years ago
788cef8
Merge branch 'nd/split-index'
by Junio C Hamano
· 11 years ago
5c1753b
merge: use argv_array when spawning merge strategy
by Jeff King
· 11 years ago
03b8664
read-cache: new API write_locked_index instead of write_index/write_cache
by Nguyễn Thái Ngọc Duy
· 11 years ago
db699a8
Move try_merge_command and checkout_fast_forward to libgit.a
by Nguyễn Thái Ngọc Duy
· 12 years ago