summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 13:15:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 13:15:56 -0700
commit6beb484f25c9b11baf0edef4bc9cbfa7e3261df6 (patch)
tree169530977fdbb39df09fea5d684372941af71633 /merge.c
parentMerge branch 'kb/p4merge' (diff)
parentrefs.c: fix fread error handling (diff)
downloadtgif-6beb484f25c9b11baf0edef4bc9cbfa7e3261df6.tar.xz
Merge branch 'jc/reflog-reverse-walk'
An internal function used to implement "git checkout @{-1}" was hard to use correctly. * jc/reflog-reverse-walk: refs.c: fix fread error handling reflog: add for_each_reflog_ent_reverse() API for_each_recent_reflog_ent(): simplify opening of a reflog file for_each_reflog_ent(): extract a helper to process a single entry
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions