summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-10 14:20:06 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-10 14:20:06 -0800
commit0e35fcb412965f855e5ac6f469343e2f8e28d5ae (patch)
treee7327947fac2a114a123e00b125bfd24cdc08404 /contrib
parent81ad6a9c538bdbc24754cab577d8e480a8c5d012 (diff)
parent7c121788f4c93a29dbec0d61b3cd986a757a5077 (diff)
downloadgit-0e35fcb412965f855e5ac6f469343e2f8e28d5ae.tar.gz
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 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 15ebba51dc..45ec47f2b1 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2060,6 +2060,7 @@ _git_config ()
core.sparseCheckout
core.symlinks
core.trustctime
+ core.untrackedCache
core.warnAmbiguousRefs
core.whitespace
core.worktree