From 2645d705ecae88b1fa8b4f44c8a4579eb67fba28 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 3 Oct 2012 16:14:05 +0200 Subject: [PATCH] Fixed issue #1426: Pull Dialog: Unknown option 'no-ff' when using no-tags Signed-off-by: Sven Strickroth (cherry picked from commit 72666691882193ebde3e92a9b7c291939c5679c3) --- src/Changelog.txt | 6 ++++++ src/TortoiseProc/Commands/PullCommand.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 342868b1d..f89b95652 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,3 +1,9 @@ += Release 1.7.14.0 = +Released: unreleased + +== Bug Fix == +Fixed issue #1426: Pull Dialog: Unknown option 'no-ff' when using no-tags + = Release 1.7.13.0 = Released: 2012-09-30 diff --git a/src/TortoiseProc/Commands/PullCommand.cpp b/src/TortoiseProc/Commands/PullCommand.cpp index ba1f58fd7..123199f6e 100644 --- a/src/TortoiseProc/Commands/PullCommand.cpp +++ b/src/TortoiseProc/Commands/PullCommand.cpp @@ -91,7 +91,7 @@ bool PullCommand::Execute() 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"), notags, cmdRebase, noff, ffonly, squash, nocommit, url, dlg.m_RemoteBranchName); + cmd.Format(_T("git.exe pull -v %s %s %s %s %s %s \"%s\" %s"), cmdRebase, noff, ffonly, squash, nocommit, notags, url, dlg.m_RemoteBranchName); CProgressDlg progress; progress.m_GitCmd = cmd; progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_PULL_DIFFS))); -- 2.11.4.GIT