summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-09-28 20:06:15 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-28 10:46:35 -0700
commit744e4697555d4982acf0862f8fa6b15dd4796c37 (patch)
tree2898f43f225e423371f8567b6d8b7982c10f08c8 /builtin/merge-file.c
parententer_repo: allow .git files in strict mode (diff)
downloadtgif-744e4697555d4982acf0862f8fa6b15dd4796c37.tar.xz
clone: allow --local from a linked checkout
Noticed-by: Bjørnar Snoksrud <snoksrud@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions