diff options
| author | Orgad Shaneh <[email protected]> | 2013-05-06 22:40:41 +0300 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2013-05-07 11:01:08 +0200 |
| commit | e836cd082c49b56ca337a168ab555905ebaf6cb8 (patch) | |
| tree | 448a41892941a88e706675eecf4f6296822cfb3e /src/plugins/git/gitclient.h | |
| parent | 1f38110dad33507a7e1dd8bd96010f6e0b4f8c8b (diff) | |
Git: Prefer remote tracking branch in GerritPushDialog
In case it contains the latest remote commit
Change-Id: Id9e4cc40b7d1aa9daac3a9a2cf9ba41f589da7eb
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 10ef91b9f5c..b02ed7cffb3 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -240,6 +240,8 @@ public: void interactiveRebase(const QString &workingDirectory, const QString &commit, StashGuard &stashGuard, bool fixup); void synchronousAbortCommand(const QString &workingDir, const QString &abortCommand); + QString synchronousTrackingBranch(const QString &workingDirectory, + const QString &branch = QString()); // git svn support (asynchronous). void synchronousSubversionFetch(const QString &workingDirectory); |