From 963af0c6e92b19e775ebec0a7d70d05c5fb6ef80 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 31 Aug 2013 20:16:04 +0800
Subject: [PATCH 1/3] Add git blame

---
 src/AddIns/VersionControl/GitAddIn/GitAddIn.addin       | 4 ++++
 src/AddIns/VersionControl/GitAddIn/Src/Commands.cs      | 8 ++++++++
 src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
index 2bbb32c7f1..26172cf8ca 100644
--- a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
+++ b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
@@ -40,6 +40,10 @@
 			<MenuItem id = "GitLog"
 			          label = "Git ${res:AddIns.Subversion.ShowLog}..."
 			          class = "ICSharpCode.GitAddIn.GitLogCommand"/>
+			
+			<MenuItem id = "GitBlame"
+			          label = "Git ${res:AddIns.Subversion.Blame}..."
+			          class = "ICSharpCode.GitAddIn.GitBlameCommand"/>
 		</Condition>
 	</Path>
 	
diff --git a/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs b/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
index d0af47f6c2..b978b5055f 100644
--- a/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
+++ b/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
@@ -100,4 +100,12 @@ namespace ICSharpCode.GitAddIn
 			GitGuiWrapper.Log(filename, callback);
 		}
 	}
+	
+	public class GitBlameCommand : GitCommand
+	{
+		protected override void Run(string filename, Action callback)
+		{
+			GitGuiWrapper.Blame(filename, callback);
+		}
+	}
 }
diff --git a/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs b/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
index ee8f962536..974ad1e184 100644
--- a/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
+++ b/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
@@ -100,5 +100,10 @@ namespace ICSharpCode.GitAddIn
 		{
 			Proc("log", fileName, callback);
 		}
+		
+		public static void Blame(string fileName, Action callback)
+		{
+			Proc("blame", fileName, callback);
+		}
 	}
 }

From 48e59cbb1a33285f67d6a47988cd1f4a0bac08c6 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 31 Aug 2013 20:22:51 +0800
Subject: [PATCH 2/3] Add git settings

---
 src/AddIns/VersionControl/GitAddIn/GitAddIn.addin       | 4 ++++
 src/AddIns/VersionControl/GitAddIn/Src/Commands.cs      | 8 ++++++++
 src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
index 26172cf8ca..0406befc5b 100644
--- a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
+++ b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
@@ -44,6 +44,10 @@
 			<MenuItem id = "GitBlame"
 			          label = "Git ${res:AddIns.Subversion.Blame}..."
 			          class = "ICSharpCode.GitAddIn.GitBlameCommand"/>
+			
+			<MenuItem id = "GitSettings"
+			          label = "Git ${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.SettingsGroupBox}"
+			          class = "ICSharpCode.GitAddIn.GitSettingsCommand"/>
 		</Condition>
 	</Path>
 	
diff --git a/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs b/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
index b978b5055f..b1be2ca685 100644
--- a/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
+++ b/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
@@ -108,4 +108,12 @@ namespace ICSharpCode.GitAddIn
 			GitGuiWrapper.Blame(filename, callback);
 		}
 	}
+	
+	public class GitSettingsCommand : GitCommand
+	{
+		protected override void Run(string filename, Action callback)
+		{
+			GitGuiWrapper.ShowGitSettings(filename, callback);
+		}
+	}
 }
diff --git a/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs b/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
index 974ad1e184..5babad447f 100644
--- a/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
+++ b/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
@@ -105,5 +105,10 @@ namespace ICSharpCode.GitAddIn
 		{
 			Proc("blame", fileName, callback);
 		}
+
+		public static void ShowGitSettings(string fileName, Action callback)
+		{
+			Proc("settings", fileName, callback);
+		}
 	}
 }

From caf823381254d0a7741a5eb469c66aa6491789a3 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 31 Aug 2013 20:32:28 +0800
Subject: [PATCH 3/3] Add git sync

---
 data/resources/StringResources.resx                     | 4 ++++
 src/AddIns/VersionControl/GitAddIn/GitAddIn.addin       | 4 ++++
 src/AddIns/VersionControl/GitAddIn/Src/Commands.cs      | 8 ++++++++
 src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs | 5 +++++
 4 files changed, 21 insertions(+)

diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx
index ed5268815f..759c54798c 100644
--- a/data/resources/StringResources.resx
+++ b/data/resources/StringResources.resx
@@ -403,6 +403,10 @@ They will stop working after removing this AddIn! Are you sure you want to conti
   <data name="AddIns.ClassDiagram.ShowClassDiagram" xml:space="preserve">
     <value>Show Class Diagram</value>
   </data>
+  <data name="AddIns.Git.Sync" xml:space="preserve">
+    <value>Sync</value>
+    <comment>Synchronize changes with remote repository</comment>
+  </data>
   <data name="AddIns.Git.TortoiseGitRequired" xml:space="preserve">
     <value>TortoiseGit needs to be installed to execute this action.</value>
     <comment>Error message when executing git command but TortoiseGit cannot be found</comment>
diff --git a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
index 0406befc5b..f5ba229d00 100644
--- a/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
+++ b/src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
@@ -41,6 +41,10 @@
 			          label = "Git ${res:AddIns.Subversion.ShowLog}..."
 			          class = "ICSharpCode.GitAddIn.GitLogCommand"/>
 			
+			<MenuItem id = "GitSync"
+			          label = "Git ${res:AddIns.Git.Sync}..."
+			          class = "ICSharpCode.GitAddIn.GitSyncCommand"/>
+			
 			<MenuItem id = "GitBlame"
 			          label = "Git ${res:AddIns.Subversion.Blame}..."
 			          class = "ICSharpCode.GitAddIn.GitBlameCommand"/>
diff --git a/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs b/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
index b1be2ca685..b88c118b1b 100644
--- a/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
+++ b/src/AddIns/VersionControl/GitAddIn/Src/Commands.cs
@@ -101,6 +101,14 @@ namespace ICSharpCode.GitAddIn
 		}
 	}
 	
+	public class GitSyncCommand : GitCommand
+	{
+		protected override void Run(string filename, Action callback)
+		{
+			GitGuiWrapper.Sync(filename, callback);
+		}
+	}
+	
 	public class GitBlameCommand : GitCommand
 	{
 		protected override void Run(string filename, Action callback)
diff --git a/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs b/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
index 5babad447f..f71259edf6 100644
--- a/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
+++ b/src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
@@ -101,6 +101,11 @@ namespace ICSharpCode.GitAddIn
 			Proc("log", fileName, callback);
 		}
 		
+		public static void Sync(string fileName, Action callback)
+		{
+			Proc("sync", fileName, callback);
+		}
+		
 		public static void Blame(string fileName, Action callback)
 		{
 			Proc("blame", fileName, callback);