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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
This commit is contained in:
Eike Ziller
2016-08-22 16:30:49 +02:00
parent f41b48ef5d e87da5a08a
commit 841778ed69
19 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1965,7 +1965,7 @@ GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &wo
const QString gitDir = findGitDirForRepository(workingDirectory);
if (QFile::exists(gitDir + "/MERGE_HEAD"))
return Merge;
else if (QFile::exists(gitDir + "/rebase-apply/rebasing"))
else if (QFile::exists(gitDir + "/rebase-apply"))
return Rebase;
else if (QFile::exists(gitDir + "/rebase-merge"))
return RebaseMerge;