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

Git: Implement "Fixup previous commit"

Browse Source 
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-04-30 23:26:47 +03:00
committed by Orgad Shaneh
parent 5d325f6b1a
commit 8695fe6d7c
11 changed files with 117 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,7 +238,7 @@ public:
bool synchronousRevert(const QString &workingDirectory, const QString &commit);
bool synchronousCherryPick(const QString &workingDirectory, const QString &commit);
void interactiveRebase(const QString &workingDirectory, const QString &commit,
StashGuard &stashGuard);
StashGuard &stashGuard, bool fixup);
void synchronousAbortCommand(const QString &workingDir, const QString &abortCommand);
// git svn support (asynchronous).
@@ -267,6 +267,7 @@ public:
bool addAndCommit(const QString &workingDirectory,
const GitSubmitEditorPanelData &data,
CommitType commitType,
const QString &amendSHA1,
const QString &messageFile,
VcsBase::SubmitFileModel *model);
@@ -376,6 +377,7 @@ private:
QSignalMapper *m_repositoryChangedSignalMapper;
GitSettings *m_settings;
QString m_gitQtcEditor;
bool m_disableEditor;
};
} // namespace Internal