From 91a3a79693de685010e6e123cb76690e6837fa09 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hi@planetpeanut.uk>
Date: Fri, 3 Feb 2017 01:03:01 +0000
Subject: [PATCH] repo git: Resolve conflicts with SparkleShare as author

---
 Sparkles/Git/GitRepository.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Sparkles/Git/GitRepository.cs b/Sparkles/Git/GitRepository.cs
index 3bbef883..b18969a0 100644
--- a/Sparkles/Git/GitRepository.cs
+++ b/Sparkles/Git/GitRepository.cs
@@ -568,7 +568,9 @@ namespace Sparkles.Git {
 
             Add ();
 
-            var git = new GitCommand (LocalPath, "commit --message \"Conflict resolution by SparkleShare\"");
+            var git = new GitCommand (LocalPath,
+                "commit --message=\"Conflict resolution\" --author=\"SparkleShare <info@sparkleshare.org>\"");
+
             git.StartInfo.RedirectStandardOutput = false;
             git.StartAndWaitForExit ();