Fri, 16 Nov 2018 15:42:47 +0100

Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'

This brings substantial wins in performance because the FSCache is now
per-thread, being merged to the primary thread only at the end, so we do
not have to lock (except while merging).

Signed-off-by: Johannes Schindelin <[email protected]>

Fri, 16 Nov 2018 12:07:19 +0100

Merge pull request #1910 from benpeart/fscache_statistics-gfw

fscache: add fscache hit statistics

Fri, 16 Nov 2018 12:04:15 +0100

Merge pull request #1914 from benpeart/free-fscache-after-add-gfw

At the end of the add command, disable and free the fscache

Thu, 15 Nov 2018 10:29:58 +0100

Merge pull request #1900 from tanushree27/remove-ipv6-fallback

[Outreachy] Removed ipv6 fallback

Wed, 7 Nov 2018 10:52:41 +0100

Merge pull request #1915 from dscho/open-in-gdb

Add a helper function to start GDB that was already attached to the current process

Mon, 5 Nov 2018 14:24:12 +0100

Merge pull request #1911 from benpeart/git_test_fscache-gfw

fscache: add GIT_TEST_FSCACHE support

Mon, 5 Nov 2018 13:53:07 +0100

Merge pull request #1908 from benpeart/FindFirstFileEx-gfw

fscache: use FindFirstFileExW to avoid retrieving the short name

Wed, 31 Oct 2018 15:08:16 +0100

Merge pull request #1897 from piscisaureus/symlink-attr

Specify symlink type in .gitattributes

Wed, 17 Oct 2018 10:15:37 +0200

Merge pull request #1859 from dscho/funny-cased-cwd

Fix t0001 when the current working directory differs in case from the canonical form

Fri, 12 Oct 2018 23:04:12 +0200

Merge 'builtin-stash-rebase-v3'

To avoid having to play tricks as in earlier rounds, we bit the sour
apple and rebased the `builtin-stash-rebase-v3` branch thicket onto the
commit starting Git for Windows' merging-rebase.

(The merging-rebase pulls in the previous branch thicket via a "fake
merge", i.e. a merge commit that does not actually apply any changes
from the merged commit history. This has the unfortunate side effect of
confusing `merge` into thinking that any branch that was merged into an
earlier round does not need to be merged again.)

Signed-off-by: Johannes Schindelin <[email protected]>