diff options
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 3d65928b6c..8c7670d021 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -106,7 +106,8 @@ public: bool synchronousInit(const QString &workingDirectory); bool synchronousCheckoutFiles(const QString &workingDirectory, QStringList files = QStringList(), - QString revision = QString(), QString *errorMessage = 0); + QString revision = QString(), QString *errorMessage = 0, + bool revertStaging = true); // Checkout branch bool synchronousCheckoutBranch(const QString &workingDirectory, const QString &branch, QString *errorMessage = 0); @@ -156,7 +157,7 @@ public: void subversionLog(const QString &workingDirectory); void stashPop(const QString &workingDirectory); - void revert(const QStringList &files); + void revert(const QStringList &files, bool revertStaging); void branchList(const QString &workingDirectory); void stashList(const QString &workingDirectory); bool synchronousStashList(const QString &workingDirectory, @@ -241,7 +242,10 @@ private: unsigned synchronousGitVersion(bool silent, QString *errorMessage = 0); enum RevertResult { RevertOk, RevertUnchanged, RevertCanceled, RevertFailed }; - RevertResult revertI(QStringList files, bool *isDirectory, QString *errorMessage); + RevertResult revertI(QStringList files, + bool *isDirectory, + QString *errorMessage, + bool revertStaging); void connectRepositoryChanged(const QString & repository, GitCommand *cmd); void pull(const QString &workingDirectory, bool rebase); |