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

Git: Suggest running mergetool if pull fails

Browse Source 
Change-Id: Ic2fe525ea9e63a5ecdd1ab23dc07ede810aa192e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-14 21:49:25 +02:00
committed by Orgad Shaneh
parent 7ba0433b2b
commit 099345d110
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitclient.h
View File

@@ -167,7 +167,6 @@ public:
bool cloneRepository(const QString &directory, const QByteArray &url);
QString vcsGetRepositoryURL(const QString &directory);
bool synchronousFetch(const QString &workingDirectory, const QString &remote);
bool synchronousPull(const QString &workingDirectory);
bool synchronousPull(const QString &workingDirectory, bool rebase);
bool synchronousPush(const QString &workingDirectory, const QString &remote = QString());
@@ -285,7 +284,7 @@ private:
QString *errorMessage,
bool revertStaging);
void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd);
void syncAbortPullRebase(const QString &workingDir);
void handleMergeConflicts(const QString &workingDir, bool rebase);
bool tryLauchingGitK(const QProcessEnvironment &env,
const QString &workingDirectory,
const QString &gitBinDirectory,