Merge branch 'rs/reflog-exists'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:23:04 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:23:04 +0000 (11:23 -0700)
* rs/reflog-exists:
checkout.c: use ref_exists instead of file_exist
refs.c: add new functions reflog_exists and delete_reflog

1  2 
builtin/checkout.c
refs.c
refs.h
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs.h
Simple merge