summaryrefslogtreecommitdiff
path: root/abspath.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 22:55:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 22:55:07 -0800
commit424f30a5ae3ff26fca14df71cce31b06d1dec919 (patch)
treed4c464ab476a9847fe5f70a747864a0e386020b0 /abspath.c
parentMerge branch 'jn/branch-move-to-self' (diff)
parentcheckout,merge: disallow overwriting ignored files with --no-overwrite-ignore (diff)
downloadtgif-424f30a5ae3ff26fca14df71cce31b06d1dec919.tar.xz
Merge branch 'nd/ignore-might-be-precious'
* nd/ignore-might-be-precious: checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
Diffstat (limited to 'abspath.c')
0 files changed, 0 insertions, 0 deletions