Add launch rebase option at fetch dialog.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / PullFetchDlg.h

diff --git a/src/TortoiseProc/PullFetchDlg.h b/src/TortoiseProc/PullFetchDlg.h
index 3297236..813ac91 100644 (file)
--- a/src/TortoiseProc/PullFetchDlg.h
+++ b/src/TortoiseProc/PullFetchDlg.h
@@ -24,11 +24,13 @@ protected:
        CHistoryCombo   m_RemoteBranch;\r
        virtual BOOL OnInitDialog();\r
        CRegString m_RemoteReg;\r
-       \r
+       CRegDWORD       m_regRebase;\r
+\r
        DECLARE_MESSAGE_MAP()\r
 public:\r
        BOOL        m_IsPull;\r
     BOOL        m_bAutoLoad;\r
+       BOOL            m_bRebase;\r
     BOOL        m_bAutoLoadEnable;\r
     CHyperLink  m_RemoteManage;\r
 \r
@@ -37,4 +39,8 @@ public:
        CString m_RemoteURL;\r
        CString m_RemoteBranchName;\r
     afx_msg void OnStnClickedRemoteManage();\r
+       afx_msg void OnBnClickedButtonBrowseRef();\r
+\r
+       CString         m_configPullRemote;\r
+       CString         m_configPullBranch;\r
 };\r