Tue, 4 Dec 2018 11:26:52 +0100

fixup! builtin rebase: call `git am` directly

This fixes the reflog messages, as expected by t3406 in v2.20.0-rc2, as
well as fixing a compiler warning about "" being an invalid
printf()-style format. Also, while at it, ensure that
.git/rebased-patches is truncated if it already exists.

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

Fri, 30 Nov 2018 09:44:55 +0100

Merge pull request #1958 from dscho/ansi-unicode

mingw: safeguard against compiling with `-DUNICODE`

Wed, 28 Nov 2018 16:35:27 +0100

Merge pull request #1956 from dscho/azure-pipelines-skip-rebase-p

Prepare for skipping `git rebase -p` tests on Azure Pipelines

Tue, 27 Nov 2018 13:38:41 +0100

Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw

 fscache: teach fscache to use NtQueryDirectoryFile

Tue, 27 Nov 2018 23:39:52 +0100

Merge pull request #1957 from dscho/fix-msvc-build

Fix MSVC/Visual Studio build

Mon, 26 Nov 2018 16:57:06 +0100

Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw

fscache: make fscache_enable() thread safe

Fri, 23 Nov 2018 20:44:38 +0100

mingw: fix CPU reporting in `git version --build-options`

We cannot rely on `uname -m` in Git for Windows' SDK to tell us what
architecture we are compiling for, as we can compile both 32-bit and
64-bit `git.exe` from a 64-bit SDK, but the `uname -m` in that SDK will
always report `x86_64`.

So let's go back to our original design. And make it explicitly
Windows-specific.

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

Fri, 23 Nov 2018 13:23:46 +0100

fixup! mingw: remove obsolete IPv6-related code

We still need to ensure that sockets are initialized when calling
`getaddrinfo()`, otherwise git:// URLs cannot be accessed.

This fixes https://github.com/git-for-windows/git/issues/1949.

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

Wed, 21 Nov 2018 18:09:21 +0100

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

[Outreachy] Removed ipv6 fallback

Mon, 19 Nov 2018 23:30:19 +0100

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

[Outreachy] Removed ipv6 fallback