X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2FTortoiseShell%2FGlobals.h;h=63b4e22443e51fe4befb2186111aa9294e8089b4;hb=ff53e3a5a5c76fdd81999eb5eea97ac013ba7a6b;hp=834c4fe7b4fd726355413649b151f0d975c5b49c;hpb=83879923308caebe192924b1f693b0f510aa1fd1;p=tortoisegit%2FTortoiseGitJp.git

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