Check 'all merge' flag when receiving full log

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 003a0db..89d732e 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -1541,7 +1541,12 @@ public:
 void CGitLogListBase::FetchFullLogInfo()\r
 {\r
        CGitCall_FetchFullLogInfo fetcher(this);\r
-       g_Git.GetLog(&fetcher,CString(),NULL,-1,CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_DETECT_COPYRENAME);\r
+       int mask=\r
+               CGit::LOG_INFO_STAT|\r
+               CGit::LOG_INFO_FILESTATE|\r
+               CGit::LOG_INFO_DETECT_COPYRENAME|\r
+               m_ShowMask;\r
+       g_Git.GetLog(&fetcher,CString(),NULL,-1,mask);\r
 }\r
 \r
 void CGitLogListBase::FetchFullLogInfoOrig()\r