diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-10 22:20:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-10 22:20:06 (GMT) |
| commit | 0e35fcb412965f855e5ac6f469343e2f8e28d5ae (patch) | |
| tree | e7327947fac2a114a123e00b125bfd24cdc08404 /contrib | |
| parent | 81ad6a9c538bdbc24754cab577d8e480a8c5d012 (diff) | |
| parent | 7c121788f4c93a29dbec0d61b3cd986a757a5077 (diff) | |
| download | git-0e35fcb412965f855e5ac6f469343e2f8e28d5ae.zip git-0e35fcb412965f855e5ac6f469343e2f8e28d5ae.tar.gz git-0e35fcb412965f855e5ac6f469343e2f8e28d5ae.tar.bz2 | |
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.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 15ebba5..45ec47f 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 |