Fix error in call to GetTimeZoneInformation().

[tortoisegit/TortoiseGitJp.git] / src / Git / Git.h

diff --git a/src/Git/Git.h b/src/Git/Git.h
index dfcd4b1..e661e8f 100644 (file)
--- a/src/Git/Git.h
+++ b/src/Git/Git.h
@@ -11,6 +11,7 @@ private:
        GitAdminDir m_GitDir;\r
 public:\r
        static BOOL CheckMsysGitDir();\r
+       static CString ms_LastMsysGitDir;       // the last msysgitdir added to the path, blank if none\r
 \r
 //     static CString m_MsysGitPath;\r
        CGit(void);\r
@@ -48,7 +49,10 @@ public:
         LOG_INFO_ALL_BRANCH=0x20,\r
                LOG_INFO_ONLY_HASH=0x40,\r
                LOG_INFO_DETECT_RENAME=0x80,\r
-               LOG_INFO_DETECT_COPYRENAME=0x100\r
+               LOG_INFO_DETECT_COPYRENAME=0x100,\r
+               LOG_INFO_FIRST_PARENT = 0x200,\r
+               LOG_INFO_NO_MERGE = 0x400,\r
+               LOG_INFO_FOLLOW = 0x800\r
        }LOG_INFO_MASK;\r
 \r
        int GetRemoteList(STRING_VECTOR &list);\r