summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-06-22 14:31:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-22 14:31:57 -0700
commit66915b5d7cc9b66bf8c452bb62c67da371c21d90 (patch)
tree44a4f9b55c19a4c7d5334f736d0276481a8aae74 /merge-file.c
parentMerge branch 'jn/web' (diff)
parentMake old sha1 optional with git update-ref -d (diff)
downloadtgif-66915b5d7cc9b66bf8c452bb62c67da371c21d90.tar.xz
Merge branch 'kh/update-ref'
* kh/update-ref: Make old sha1 optional with git update-ref -d Clean up builtin-update-ref's option parsing
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions