Thu, 11 Oct 2018 09:50:26 +0200

Merge pull request #1816 from csware/init-variable

Don't use uninitialized variable

Thu, 4 Oct 2018 18:20:37 +0000

Merge pull request #1864 from dscho/reinstate-cousins

Two things I totally forgot

Wed, 3 Oct 2018 19:40:18 +0000

Merge pull request #1862 from dscho/fixup-poll.c

Fix up compat/poll/poll.c

Fri, 28 Sep 2018 10:59:09 +0200

Merge pull request #1853 from dscho/fix-gc-segfault

Fix occasional segmentation fault in `git gc`

Fri, 28 Sep 2018 00:39:59 +0200

Merge pull request #1827 from benpeart/fscache_refresh_index

Enable the filesystem cache (fscache) in refresh_index().

Thu, 27 Sep 2018 14:29:12 -0400

Merge pull request #1852 from dscho/built-in-stash-rebase-fixes

Built-in stash/rebase fixes

Wed, 26 Sep 2018 22:10:36 +0200

Merge pull request #1850 from dscho/fix-badge

fixup! Merge remote-tracking branch 'origin/master' into azure-pipelines

Mon, 24 Sep 2018 16:57:30 -0400

Merge pull request #1837 from git-for-windows/azure-pipelines

Set up CI with Azure Pipelines

Tue, 18 Sep 2018 13:35:29 -0400

Merge pull request #1840 from jamill/fixup_test

fixup! mingw: respect core.hidedotfiles = false in git-init again

Tue, 11 Sep 2018 09:45:57 -0400

Merge builtin-stash-rebase-v2

This trick was performed by rebasing the builtin-stash-rebase branch
thicket via `git rebase -kir v2.19.0-rc2`, replacing all branches that
made it into `pu` by their current versions (and also the builtin-stash
by the newest iteration as of ungps/git), and then calling these
commands:

	# save current tip
	tip=$(git rev-parse HEAD)

	# revert previous merge
	git reset --hard git-for-windows/master^0
	git revert -n -m 1 HEAD
	git commit --squash HEAD -s -m "Let's drop this"

	# now perform the 3-way merge with v2.19.0-rc2 as base
	git merge-recursive v2.19.0-rc2 -- HEAD $tip
	git merge --ff-only \
		$(git commit-tree -p HEAD -p $tip -m "Merge" \
			$(git write-tree))
	git commit -c HEAD^^ --amend -s

The merge-recursive dance is necessary because of the merging-rebases:
the fake merges with which these start are mistaken by `git merge` to
mean that the branches were already merged, when the fake merges undid
the corresponding changes.

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