feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
This commit is contained in:
Eike Ziller
2015-04-15 17:45:47 +02:00
parent 3d6d33f60d bd964ab0be
commit 50fe3585a8
65 changed files with 2457 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/gitclient.cpp
View File

@@ -2964,7 +2964,6 @@ void GitClient::interactiveRebase(const QString &workingDirectory, const QString
if (fixup)
arguments << QLatin1String("--autosquash");
arguments << commit + QLatin1Char('^');
VcsOutputWindow::appendCommand(workingDirectory, vcsBinary(), arguments);
if (fixup)
m_disableEditor = true;
VcsCommand *command = vcsExecAbortable(workingDirectory, arguments);