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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	src/shared/qbs

Change-Id: I05c4945d238b7724ca73477fc3b21554564951c0
This commit is contained in:
Eike Ziller
2017-02-20 15:20:14 +01:00
parent 6ba90cd06a 7ee75bf4c2
commit dbb2288f1a
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
};