forked from qt-creator/qt-creator
Git: Do not suggest to continue command when commit editor is active
When executing mergetool from the commit editor it is unlikely that the user wants to do anything but to commit. Change-Id: I1302951c4afee554b35a261d60f402b56c077681 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
1dc90bcf44
commit
eb375d734d
@@ -91,6 +91,7 @@ public:
|
||||
|
||||
GitClient *client() const;
|
||||
Gerrit::Internal::GerritPlugin *gerritPlugin() const;
|
||||
bool isCommitEditorOpen() const;
|
||||
|
||||
public slots:
|
||||
void startCommit();
|
||||
@@ -190,7 +191,6 @@ private:
|
||||
const Core::Context &context);
|
||||
|
||||
void updateRepositoryBrowserAction();
|
||||
bool isCommitEditorOpen() const;
|
||||
Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd);
|
||||
void cleanCommitMessageFile();
|
||||
void cleanRepository(const QString &directory);
|
||||
|
||||
Reference in New Issue
Block a user