OSDN Git Service

Pull/Fetch Dlg: Used git config to determine default remote and remote branch. Also...
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / PullCommand.cpp
index ddab7fe..5419e0d 100644 (file)
@@ -44,7 +44,10 @@ bool PullCommand::Execute()
                \r
                CString cmd;\r
                CString hashOld = g_Git.GetHash(L"HEAD");\r
-               cmd.Format(_T("git.exe pull \"%s\" %s"),url,dlg.m_RemoteBranchName);\r
+               CString cmdRebase;\r
+               if(dlg.m_bRebase)\r
+                       cmdRebase = "--rebase ";\r
+               cmd.Format(_T("git.exe pull %s\"%s\" %s"),cmdRebase, url, dlg.m_RemoteBranchName);\r
                CProgressDlg progress;\r
                progress.m_GitCmd = cmd;\r
                progress.m_bAutoCloseOnSuccess = true;\r