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

Git: Use StashGuard for merge and rebase

Browse Source 
Change-Id: I7c9059396aaac78c769518b34c7bf68bfe9932ec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-01-22 21:27:54 +02:00
parent 5551c1e906
commit 177f774036
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ public:
class StashGuard
{
public:
StashGuard(const QString &workingDirectory, const QString &keyword);
StashGuard(const QString &workingDirectory, const QString &keyword, bool askUser = true);
~StashGuard();
void preventPop();