diff options
author | Eike Ziller <[email protected]> | 2017-02-20 15:20:14 +0100 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2017-02-20 15:20:14 +0100 |
commit | dbb2288f1a39904020a50b33a930a7cdca930422 (patch) | |
tree | e1281fe2ace67322ad6e4481b4f78f6a6beaced3 /src/plugins/git/gitclient.h | |
parent | 6ba90cd06a8953ef55108396b24c379c1f0aac99 (diff) | |
parent | 7ee75bf4c21bac6992f0d63bf2ce850828a39eb0 (diff) |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/shared/qbs
Change-Id: I05c4945d238b7724ca73477fc3b21554564951c0
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r-- | src/plugins/git/gitclient.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index bfc98aa5c07..126461636fe 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -113,10 +113,10 @@ public: void stashPrompt(const QString &command, const QString &statusOutput, QString *errorMessage); void executeStash(const QString &command, QString *errorMessage); - StashResult m_stashResult; + StashResult m_stashResult = NotStashed; QString m_message; QString m_workingDir; - StashFlag m_flags; + StashFlag m_flags = Default; PushAction m_pushAction = NoPush; }; |