diff options
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index de86aea73b..69f11e9553 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -244,13 +244,15 @@ public: QStringList synchronousBranchesForCommit(const QString &workingDirectory, const QString &revision); bool isRemoteCommit(const QString &workingDirectory, const QString &commit); + bool isFastForwardMerge(const QString &workingDirectory, const QString &branch); bool cloneRepository(const QString &directory, const QByteArray &url); QString vcsGetRepositoryURL(const QString &directory); void fetch(const QString &workingDirectory, const QString &remote); bool synchronousPull(const QString &workingDirectory, bool rebase); void push(const QString &workingDirectory, const QStringList &pushArgs = QStringList()); - bool synchronousMerge(const QString &workingDirectory, const QString &branch); + bool synchronousMerge(const QString &workingDirectory, const QString &branch, + bool allowFastForward = true); bool canRebase(const QString &workingDirectory) const; void rebase(const QString &workingDirectory, const QString &baseBranch); bool synchronousRevert(const QString &workingDirectory, const QString &commit); @@ -374,7 +376,7 @@ private: const QStringList &arguments, VcsBase::VcsBaseEditorWidget* editor = 0, bool useOutputToWindow = false, - bool expectChanges = false, + unsigned additionalFlags = 0, int editorLineNumber = -1); // Fully synchronous git execution (QProcess-based). |