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

Git: Disable rebase and fixup when there's a command in progress

Browse Source 
Change-Id: Ifa2f781cb1f31afaf7b0af4e4a0dd08fb58296d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-11 23:01:54 +03:00
committed by Orgad Shaneh
parent 1686e314bd
commit 3591c1df57
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,6 +142,7 @@ private slots:
void push();
void startMergeTool();
void continueOrAbortCommand();
void updateContinueAndAbortCommands();
#ifdef WITH_TESTS
void testStatusParsing_data();
@@ -190,7 +191,6 @@ private:
const Core::Context &context,
bool addToLocator, GitClientMemberFunc);
void updateContinueAndAbortCommands();
void updateRepositoryBrowserAction();
bool isCommitEditorOpen() const;
Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd);
@@ -218,6 +218,8 @@ private:
QAction *m_continueRebaseAction;
QAction *m_continueCherryPickAction;
QAction *m_continueRevertAction;
QAction *m_fixupCommitAction;
QAction *m_interactiveRebaseAction;
QVector<Utils::ParameterAction *> m_fileActions;
QVector<Utils::ParameterAction *> m_projectActions;