diff options
Diffstat (limited to 'src/plugins/git/branchview.h')
-rw-r--r-- | src/plugins/git/branchview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/git/branchview.h b/src/plugins/git/branchview.h index 9a1a3c1e455..d272a5e2194 100644 --- a/src/plugins/git/branchview.h +++ b/src/plugins/git/branchview.h @@ -17,6 +17,8 @@ class QToolButton; class QTreeView; QT_END_NAMESPACE; +namespace Tasking { class TaskTree; } + namespace Utils { class ElidingLabel; class NavigationTreeView; @@ -54,7 +56,7 @@ private: bool remove(); bool rename(); bool reset(const QByteArray &resetType); - bool isFastForwardMerge(); + Tasking::TaskTree *onFastForwardMerge(const std::function<void()> &callback); bool merge(bool allowFastForward); void rebase(); bool cherryPick(); |