git/contrib, branch v2.8.2

Merge branch 'pw/completion-stash'

2016-02-22T18:27:24Z

* pw/completion-stash: completion: fix mis-indentation in _git_stash()

completion: fix mis-indentation in _git_stash()

2016-02-22T18:26:04Z

Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

Merge branch 'cc/untracked'

2016-02-10T22:20:06Z

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

Merge branch 'pw/completion-stash'

2016-02-03T22:16:06Z

* pw/completion-stash: completion: update completion arguments for stash

Merge branch 'pw/completion-show-branch'

2016-02-03T22:16:05Z

* pw/completion-show-branch: completion: complete show-branch "--date-order"

Merge branch 'jk/completion-rebase'

2016-02-03T22:16:05Z

* jk/completion-rebase: completion: add missing git-rebase options

Merge branch 'dw/subtree-split-do-not-drop-merge'

2016-02-03T22:16:03Z

The "split" subcommand of "git subtree" (in contrib/) incorrectly skipped merges when it shouldn't, which was corrected. * dw/subtree-split-do-not-drop-merge: contrib/subtree: fix "subtree split" skipped-merge bug

Merge branch 'tb/complete-word-diff-regex'

2016-02-03T22:16:03Z

* tb/complete-word-diff-regex: completion: complete "diff --word-diff-regex="

Merge branch 'dg/subtree-test'

2016-02-03T22:16:00Z

* dg/subtree-test: contrib/subtree: Make testing easier

config: add core.untrackedCache

2016-01-27T20:30:00Z

When we know that mtime on directory as given by the environment is usable for the purpose of untracked cache, we may want the untracked cache to be always used without any mtime test or kernel name check being performed. Also when we know that mtime is not usable for the purpose of untracked cache, for example because the repo is shared over a network file system, we may want the untracked-cache to be automatically removed from the index. Allow the user to express such preference by setting the 'core.untrackedCache' configuration variable, which can take 'keep', 'false', or 'true' and default to 'keep'. When read_index_from() is called, it now adds or removes the untracked cache in the index to respect the value of this variable. So it does nothing if the value is `keep` or if the variable is unset; it adds the untracked cache if the value is `true`; and it removes the cache if the value is `false`. `git update-index --[no-|force-]untracked-cache` still adds the untracked cache to, or removes it, from the index, but this shows a warning if it goes against the value of core.untrackedCache, because the next time the index is read the untracked cache will be added or removed if the configuration is set to do so. Also `--untracked-cache` used to check that the underlying operating system and file system change `st_mtime` field of a directory if files are added or deleted in that directory. But because those tests take a long time, `--untracked-cache` no longer performs them. Instead, there is now `--test-untracked-cache` to perform the tests. This change makes `--untracked-cache` the same as `--force-untracked-cache`. This last change is backward incompatible and should be mentioned in the release notes. Helped-by: Duy Nguyen Helped-by: Torsten Bögershausen Helped-by: Stefan Beller Signed-off-by: Christian Couder Signed-off-by: Ævar Arnfjörð Bjarmason read-cache: Duy'sfixup Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano