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

2
src/plugins/git/gitclient.h
View File

@@ -213,6 +213,7 @@ public slots:
private slots:
void slotBlameRevisionRequested(const QString &source, QString change, int lineNumber);
void slotPullRebaseFinished(bool ok, int exitCode, const QVariant &cookie);
private:
VCSBase::VCSBaseEditor *createVCSEditor(const QString &kind,
@@ -245,6 +246,7 @@ private:
enum RevertResult { RevertOk, RevertUnchanged, RevertCanceled, RevertFailed };
RevertResult revertI(QStringList files, bool *isDirectory, QString *errorMessage);
void connectRepositoryChanged(const QString & repository, GitCommand *cmd);
void pull(const QString &workingDirectory, bool rebase);
const QString m_msgWait;
GitPlugin *m_plugin;