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

VCS[git]: Add menu option for git amend.

Browse Source 
Task-number: QTCREATORBUG-1642
This commit is contained in:
Friedemann Kleint
2010-08-23 12:15:48 +02:00
parent 824fd1789d
commit 0f0c17111d
11 changed files with 139 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitplugin.h
View File

@@ -122,6 +122,7 @@ private slots:
void showCommit();
void startCommit();
void startAmendCommit();
void stash();
void stashSnapshot();
void branchList();
@@ -170,10 +171,11 @@ private:
bool addToLocator, GitClientMemberFunc);
bool isCommitEditorOpen() const;
Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd);
Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd, bool amend);
void cleanCommitMessageFile();
void cleanRepository(const QString &directory);
void applyPatch(const QString &workingDirectory, QString file = QString());
void startCommit(bool amend);
static GitPlugin *m_instance;
Core::ICore *m_core;
@@ -201,6 +203,7 @@ private:
QStringList m_submitOrigCommitFiles;
QStringList m_submitOrigDeleteFiles;
QString m_commitMessageFileName;
QString m_commitAmendSHA1;
bool m_submitActionTriggered;
};