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

Git: Added Revert and cherry-pick

Browse Source 
Change-Id: Ic8ba7434e79b12eca680a67c2845c82915dc0088
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Petar Perisin
2013-01-11 00:02:08 +01:00
committed by Tobias Hunger
parent 8f4da818c8
commit 65aef73ec4
6 changed files with 132 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/mergetool.h
View File

@@ -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;
};