diff options
| author | Petar Perisin <petar.perisin@gmail.com> | 2013-01-11 00:02:08 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-21 10:41:01 +0100 |
| commit | 65aef73ec4d6ff8f6752f83571c9310f8c6d793b (patch) | |
| tree | cfad1907765bdeca9fa5b021f11c346198540815 /src/plugins/git/mergetool.h | |
| parent | 8f4da818c8a7184ffdf0268e652d2dcf867dffa9 (diff) | |
| download | qt-creator-65aef73ec4d6ff8f6752f83571c9310f8c6d793b.tar.gz | |
Git: Added Revert and cherry-pick
Change-Id: Ic8ba7434e79b12eca680a67c2845c82915dc0088
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/mergetool.h')
| -rw-r--r-- | src/plugins/git/mergetool.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h index d91876be5e..37fbe75fb8 100644 --- a/src/plugins/git/mergetool.h +++ b/src/plugins/git/mergetool.h @@ -41,6 +41,7 @@ namespace Git { namespace Internal { class MergeToolProcess; +class GitClient; class MergeTool : public QObject { @@ -77,6 +78,8 @@ private: QString stateName(FileState state, const QString &extraInfo); void chooseAction(); void addButton(QMessageBox *msgBox, const QString &text, char key); + void continuePreviousGitCommand(const QString &msgBoxTitle, const QString &msgBoxText, + const QString &buttonName, const QString &gitCommand); MergeToolProcess *m_process; MergeType m_mergeType; @@ -85,6 +88,7 @@ private: QString m_localInfo; FileState m_remoteState; QString m_remoteInfo; + GitClient *m_gitClient; bool m_merging; }; |