Start the merging-rebase to junio/maint

Browse Source

The changes in upstream/maint are actually not really that crucial for Git
for Windows, but we can use it as an excuse to fix the branch thicket: the
`visual-studio` branch clearly wants to be based on the
`jeffhostetler/vs2015` branch, as the latter contains important compile
fixes for Visual C, required to build inside Visual Studio.

While at it, we also move the Vagrant patches farther to the end, as they
are unlikely to be accepted upstream, so we'll try only after getting the
MSVC/VS patches in.

Also, let's reorder a couple other patches into more logical places.

This commit starts the rebase of 4638a925c0 to a274e0a036

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

...

This commit is contained in:

Johannes Schindelin

2016-12-12 22:15:02 +01:00

parent a274e0a036 6119d9b81b

commit 58e7864ffb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available