Merge remote-tracking branch 'remotes/origin/master' into feature/49

sboulema · Dec 14, 2018 · f9e5bf5 · f9e5bf5
2 parents 133cd93 + a1ae3f1
commit f9e5bf5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/TGit/Images.vsct b/TGit/Images.vsct
@@ -33,6 +33,8 @@
       <IDSymbol name="Fetch" value="18" />
       <IDSymbol name="BrowseRef" value="19" />
       <IDSymbol name="Tag" value="20" />
+      <IDSymbol name="AbortMerge" value="21" />
+      <IDSymbol name="Rebase" value="22" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>
diff --git a/TGit/TGIT.vsct b/TGit/TGIT.vsct
@@ -526,7 +526,7 @@
     <Bitmaps>
       <Bitmap guid="guidImages" 
               href="Resources\octicons.png" 
-              usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, browseRef, tag, abortMerge"/>     
+              usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, browseRef, tag, abortMerge, rebase"/>     
     </Bitmaps>
   </Commands>