From a536fdb0d8ada5daae0e18f1e1cc95aabec20472 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 31 Oct 2014 21:16:53 +0100 Subject: [PATCH] Make sure rebase is never executed on CLI on pull Signed-off-by: Sven Strickroth --- src/TortoiseProc/AppUtils.cpp | 2 +- src/TortoiseProc/SyncDlg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 6c6ea051e..c34835739 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -2353,7 +2353,7 @@ bool CAppUtils::Pull(bool showPush) if(ver >= 0x01070203) //above 1.7.0.2 cmdRebase += _T("--progress "); - cmd.Format(_T("git.exe pull -v %s%s%s%s%s%s%s%s\"%s\" %s"), cmdRebase, noff, ffonly, squash, nocommit, depth, notags, prune, url, dlg.m_RemoteBranchName); + cmd.Format(_T("git.exe pull -v --no-rebase %s%s%s%s%s%s%s%s\"%s\" %s"), cmdRebase, noff, ffonly, squash, nocommit, depth, notags, prune, url, dlg.m_RemoteBranchName); CProgressDlg progress; progress.m_GitCmd = cmd; diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index b28888a5c..fcd35f0d7 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -199,7 +199,7 @@ void CSyncDlg::OnBnClickedButtonPull() if(m_Gitverion >= 0x01070203) //above 1.7.0.2 force += _T("--progress "); - cmd.Format(_T("git.exe pull -v %s \"%s\" %s"), + cmd.Format(_T("git.exe pull -v --no-rebase %s \"%s\" %s"), force, m_strURL, remotebranch); -- 2.11.4.GIT