summaryrefslogtreecommitdiff
path: root/test-mergesort.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:06 -0800
commit0e35fcb412965f855e5ac6f469343e2f8e28d5ae (patch)
treee7327947fac2a114a123e00b125bfd24cdc08404 /test-mergesort.c
parentMerge branch 'js/xmerge-marker-eol' (diff)
parentt7063: add tests for core.untrackedCache (diff)
downloadtgif-0e35fcb412965f855e5ac6f469343e2f8e28d5ae.tar.xz
Merge branch 'cc/untracked'
Update the untracked cache subsystem and change its primary UI from "git update-index" to "git config". * cc/untracked: t7063: add tests for core.untrackedCache test-dump-untracked-cache: don't modify the untracked cache config: add core.untrackedCache dir: simplify untracked cache "ident" field dir: add remove_untracked_cache() dir: add {new,add}_untracked_cache() update-index: move 'uc' var declaration update-index: add untracked cache notifications update-index: add --test-untracked-cache update-index: use enum for untracked cache options dir: free untracked cache when removing it
Diffstat (limited to 'test-mergesort.c')
0 files changed, 0 insertions, 0 deletions