Git rebase #48

Author: sboulema

README.md

@@ -55,6 +55,7 @@ You can change what happens when using the finish feature command:
 * `(G)it Sho(w) Changes` - Ctrl+Shift+Alt+G, W
 * `(G)it File (B)lame` - Ctrl+Shift+Alt+G, B
 * `(G)it File (D)iff` - Ctrl+Shift+Alt+G, D
+* `(G)it Rebase` - Ctrl+Shift+Alt+G, G
 
 ## Gitflow
 So what exactly are those [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/) menu items doing?

TGit/Commands/MainMenuCommands.cs

@@ -40,6 +40,7 @@ public void AddCommands()
             CommandHelper.AddCommand(_mcs, BranchCommand, PkgCmdIDList.Branch);
             CommandHelper.AddCommand(_mcs, SwitchCommand, PkgCmdIDList.Switch);
             CommandHelper.AddCommand(_mcs, MergeCommand, PkgCmdIDList.Merge);
+            CommandHelper.AddCommand(_mcs, RebaseCommand, PkgCmdIDList.Rebase);
 
             CommandHelper.AddCommand(_mcs, RevertCommand, PkgCmdIDList.Revert);
             CommandHelper.AddCommand(_mcs, ResolveCommand, PkgCmdIDList.Resolve);
@@ -131,6 +132,12 @@ private void MergeCommand(object sender, EventArgs e)
             ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:merge /path:\"{_envHelper.GetSolutionDir()}\"");
         }
 
+        private void RebaseCommand(object sender, EventArgs e)
+        {
+            PreCommand();
+            ProcessHelper.StartTortoiseGitProc(_envHelper, $"/command:rebase /path:\"{_envHelper.GetSolutionDir()}\"");
+        }
+
         private void AbortMergeCommand(object sender, EventArgs e)
         {
             PreCommand();

TGit/PkgCmdID.cs

@@ -64,5 +64,7 @@ static class PkgCmdIDList
         public const uint SvnDCommit = 0x143;
         public const uint SvnFetch = 0x144;
         public const uint SvnRebase = 0x145;
+
+        public const uint Rebase = 0x146;
     }
 }

TGit/TGIT.vsct

@@ -343,6 +343,14 @@
         </Strings>
       </Button>
 
+      <Button guid="guidTGitCmdSet" id="rebase" priority="0x0400" type="Button">
+        <Parent guid="guidTGitCmdSet" id="fifthMenuGroup" />
+        <Icon guid="guidImages" id="rebase" />
+        <Strings>
+          <ButtonText>Rebase...</ButtonText>
+        </Strings>
+      </Button>
+
       <Button guid="guidTGitCmdSet" id="revert" priority="0x0100" type="Button">
         <Parent guid="guidTGitCmdSet" id="sixthMenuGroup" />
         <Icon guid="guidImages" id="revert" />
@@ -507,6 +515,7 @@
     <KeyBinding guid="guidTGitCmdSet" key1="G" key2="B" mod1="CONTROL SHIFT ALT" editor="guidVSStd97" id="blameContext" />
     <KeyBinding guid="guidTGitCmdSet" key1="G" key2="D" mod1="CONTROL SHIFT ALT" editor="guidVSStd97" id="diffContext" />
     <KeyBinding guid="guidTGitCmdSet" key1="G" key2="T" mod1="CONTROL SHIFT ALT" editor="guidVSStd97" id="tag" />
+    <KeyBinding guid="guidTGitCmdSet" key1="G" key2="G" mod1="CONTROL SHIFT ALT" editor="guidVSStd97" id="rebase" />
   </KeyBindings>
 
     <Symbols>
@@ -639,6 +648,8 @@
 
       <IDSymbol name="tag" value="0x0141" />
       <IDSymbol name="abortMerge" value="0x0142" />
+
+      <IDSymbol name="rebase" value="0x0146" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>

azure-pipelines.yml

@@ -6,6 +6,12 @@
 pool:
   vmImage: 'VS2017-Win2016'
 
+trigger:
+  branches:
+    include:
+    - master
+# tags: none
+
 variables:
   patch: $[counter('versioncounter', 41)]
   solution: '**/*.sln'