summaryrefslogtreecommitdiff
path: root/src/plugins/git/branchcheckoutdialog.cpp
diff options
context:
space:
mode:
authorPetar Perisin <petar.perisin@gmail.com>2012-12-21 23:49:29 +0100
committerTobias Hunger <tobias.hunger@digia.com>2013-01-07 15:26:47 +0100
commit7df112b687c8694153ef3a5938921104b6e75115 (patch)
tree3e44371f51f6170989b737a4e694ba5ea64fa4d6 /src/plugins/git/branchcheckoutdialog.cpp
parent2396f34fda5f2b57a0294f1bfa6639a2ef2a322d (diff)
downloadqt-creator-7df112b687c8694153ef3a5938921104b6e75115.tar.gz
Git: Added Merge and Rebase
Added git functions - "Merge" and "Rebase" They are in the "Branches" dialog: - Merge - merge selected branch into current one - Rebase - rebase current branch on selected one Task-number: QTCREATORBUG-8367 Change-Id: I9ed306c64d5d4b7bd1d58730a5e1009f0bd4ec0e Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/branchcheckoutdialog.cpp')
0 files changed, 0 insertions, 0 deletions