diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 91d58e775d..d3a4cc116e 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1966,7 +1966,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; |