Complete Submodule Update work

[tortoisegit/TortoiseGitJp.git] / src / TortoiseShell / Globals.h

diff --git a/src/TortoiseShell/Globals.h b/src/TortoiseShell/Globals.h
index 834c4fe..63b4e22 100644 (file)
--- a/src/TortoiseShell/Globals.h
+++ b/src/TortoiseShell/Globals.h
@@ -19,12 +19,12 @@
 #pragma once\r
 \r
 //#define MENUCHECKOUT         0x0000000000000001\r
-//#define MENUUPDATE           0x0000000000000002\r
+//#define MENUUPDATE                   0x0000000000000002\r
 #define MENUCOMMIT                     0x0000000000000004\r
 #define MENUADD                                0x0000000000000008\r
 #define MENUREVERT                     0x0000000000000010\r
 #define MENUCLEANUP                    0x0000000000000020\r
-//#define MENURESOLVE          0x0000000000000040\r
+#define MENURESOLVE                0x0000000000000040\r
 #define MENUSWITCH                     0x0000000000000080\r
 //#define MENUIMPORT           0x0000000000000100\r
 #define MENUEXPORT                     0x0000000000000200\r
@@ -33,14 +33,14 @@
 #define MENUMERGE                      0x0000000000001000\r
 #define MENUREMOVE                     0x0000000000002000\r
 #define MENURENAME                     0x0000000000004000\r
-//#define MENUUPDATEEXT                0x0000000000008000\r
+#define MENUUPDATEEXT          0x0000000000008000\r
 #define MENUDIFF                       0x0000000000010000\r
 #define MENULOG                                0x0000000000020000\r
 #define MENUCONFLICTEDITOR     0x0000000000040000\r
 //#define MENURELOCATE         0x0000000000080000\r
 #define MENUSHOWCHANGED                0x0000000000100000\r
 #define MENUIGNORE                     0x0000000000200000\r
-//#define MENUREPOBROWSE       0x0000000000400000\r
+#define MENUREFLOG                     0x0000000000400000\r
 #define MENUBLAME                      0x0000000000800000\r
 #define MENUCREATEPATCH                0x0000000001000000\r
 #define MENUAPPLYPATCH         0x0000000002000000\r
@@ -61,7 +61,12 @@
 #define MENUIMPORTPATCH                0x0000010000000000\r
 #define MENUCHERRYPICK         0x0000020000000000\r
 #define MENUFETCH                      0x0000040000000000\r
-\r
+#define MENUREBASE                     0x0000080000000000\r
+#define MENUSTASHSAVE          0x0000100000000000\r
+#define MENUSTASHAPPLY         0x0000200000000000\r
+#define MENUSTASHLIST          0x0000400000000000\r
+#define MENUSUBADD                     0x0000800000000000\r
+#define MENUSUBSYNC                    0x0001000000000000\r
 \r
 #define MENUSETTINGS           0x2000000000000000\r
 #define MENUHELP                       0x4000000000000000\r
@@ -108,4 +113,5 @@ enum FileState
 #define ITEMIS_PATCHINCLIPBOARD                0x00008000\r
 #define ITEMIS_PATHINCLIPBOARD      0x00010000\r
 #define ITEMIS_TWO                                     0x00020000\r
+#define ITEMIS_SUBMODULE                       0x00040000\r
 \r