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

VCS[git]: Introduce optional pull --rebase.

Browse Source 
Do 'git rebase --abort' if something fails.
This commit is contained in:
Friedemann Kleint
2010-03-19 16:07:34 +01:00
parent 59d827c697
commit bcd020f382
10 changed files with 89 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/gitcommand.h
View File

@@ -72,13 +72,16 @@ public:
static QString msgTimeout(int seconds);
void setCookie(const QVariant &cookie);
QVariant cookie() const;
private:
void run();
Q_SIGNALS:
void outputData(const QByteArray&);
void errorText(const QString&);
void finished(bool ok, const QVariant &cookie);
void finished(bool ok, int exitCode, const QVariant &cookie);
void success();
private:
@@ -93,7 +96,7 @@ private:
QStringList m_basicArguments;
const QString m_workingDirectory;
const QStringList m_environment;
const QVariant m_cookie;
QVariant m_cookie;
QList<Job> m_jobs;
TerminationReportMode m_reportTerminationMode;