diff options
author | Orgad Shaneh <[email protected]> | 2013-06-02 19:41:58 +0300 |
---|---|---|
committer | Orgad Shaneh <[email protected]> | 2013-06-03 10:36:22 +0200 |
commit | bcd8c02aea2e8384293b8dc0e1a69135a088d33c (patch) | |
tree | b48c955502d392bc0ee77ec37bb7c39689360f12 /src/plugins/git/gitclient.h | |
parent | 5a4cdc11cbf10e205e30bf118bc4e672a4d198af (diff) |
Git: Prevent or close fixup editor if no local commits are found
Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4
Reviewed-by: Petar Perisin <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r-- | src/plugins/git/gitclient.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 4b230594b62..02fb6f1675f 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -316,6 +316,7 @@ public: void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand); static QString msgNoChangedFiles(); + static QString msgNoCommits(bool includeRemote); static const char *noColorOption; static const char *decorateOption; |