summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2016-01-24 16:28:16 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-01-25 12:39:22 -0800
commiteaab83d0e574c9f3440a2364a7975f9ffe75f188 (patch)
tree70a71dac844d56516c0a6f3a58c4f9298db38572 /builtin/merge-ours.c
parentupdate-index: use enum for untracked cache options (diff)
downloadtgif-eaab83d0e574c9f3440a2364a7975f9ffe75f188.tar.xz
update-index: add --test-untracked-cache
It is nice to just be able to test if untracked cache is supported without enabling it. Helped-by: David Turner <dturner@twopensource.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions