Merge remote-tracking branch 'origin/4.5'

Change-Id: Ic7c16091268083c0426cf29f0691a7ee458f2bd9
This commit is contained in:
Eike Ziller
2017-12-07 09:16:01 +01:00
23 changed files with 173 additions and 48 deletions

View File

@@ -2834,7 +2834,8 @@ void GitClient::subversionLog(const QString &workingDirectory)
void GitClient::push(const QString &workingDirectory, const QStringList &pushArgs)
{
vcsExec(workingDirectory, QStringList({"push"}) + pushArgs, nullptr, true);
vcsExec(workingDirectory, QStringList({"push"}) + pushArgs, nullptr, true,
VcsCommand::ShowSuccessMessage);
}
bool GitClient::synchronousMerge(const QString &workingDirectory, const QString &branch,