From 538ffd75d67c081dae26a6de01136944ac675307 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@microsoft.com>
Date: Mon, 10 Dec 2018 09:13:13 -0500
Subject: [PATCH 1/2] Update Git to vfs-2.20.0

---
 GVFS/GVFS.Build/GVFS.props        | 2 +-
 GVFS/GVFS/CommandLine/GVFSVerb.cs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/GVFS/GVFS.Build/GVFS.props b/GVFS/GVFS.Build/GVFS.props
index 34ff89e77..b9467c2c1 100644
--- a/GVFS/GVFS.Build/GVFS.props
+++ b/GVFS/GVFS.Build/GVFS.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <GVFSVersion>0.2.173.2</GVFSVersion>
-    <GitPackageVersion>2.20181129.1</GitPackageVersion>
+    <GitPackageVersion>2.20181211.5</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">
diff --git a/GVFS/GVFS/CommandLine/GVFSVerb.cs b/GVFS/GVFS/CommandLine/GVFSVerb.cs
index 8335c7f4d..9c84433d7 100644
--- a/GVFS/GVFS/CommandLine/GVFSVerb.cs
+++ b/GVFS/GVFS/CommandLine/GVFSVerb.cs
@@ -130,7 +130,6 @@ public static bool TrySetRequiredGitConfigSettings(Enlistment enlistment)
                 { "merge.renames", "false" },
                 { "pack.useBitmaps", "false" },
                 { "receive.autogc", "false" },
-                { "reset.quiet", "true" },
                 { "status.deserializePath", gitStatusCachePath },
             };
 

From d1d371e62752c0ca150f004dbe30a9ec664f6033 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@microsoft.com>
Date: Wed, 12 Dec 2018 14:06:52 -0500
Subject: [PATCH 2/2] Use legacy rebase

---
 GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs | 1 +
 GVFS/GVFS/CommandLine/GVFSVerb.cs                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
index fbfb81e36..692d5a3ec 100644
--- a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
+++ b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
@@ -53,6 +53,7 @@ public void Initialize()
             GitProcess.Invoke(this.RootPath, "config merge.renames false");
             GitProcess.Invoke(this.RootPath, "config advice.statusUoption false");
             GitProcess.Invoke(this.RootPath, "config core.abbrev 40");
+            GitProcess.Invoke(this.RootPath, "config rebase.useBuiltin false");
             GitProcess.Invoke(this.RootPath, "config status.aheadbehind false");
             GitProcess.Invoke(this.RootPath, "config user.name \"Functional Test User\"");
             GitProcess.Invoke(this.RootPath, "config user.email \"functional@test.com\"");
diff --git a/GVFS/GVFS/CommandLine/GVFSVerb.cs b/GVFS/GVFS/CommandLine/GVFSVerb.cs
index 9c84433d7..8185b4da3 100644
--- a/GVFS/GVFS/CommandLine/GVFSVerb.cs
+++ b/GVFS/GVFS/CommandLine/GVFSVerb.cs
@@ -129,6 +129,7 @@ public static bool TrySetRequiredGitConfigSettings(Enlistment enlistment)
                 { "merge.stat", "false" },
                 { "merge.renames", "false" },
                 { "pack.useBitmaps", "false" },
+                { "rebase.useBuiltin", "false" },
                 { "receive.autogc", "false" },
                 { "status.deserializePath", gitStatusCachePath },
             };