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>
Showing
- src/plugins/git/branchdialog.cpp 39 additions, 0 deletionssrc/plugins/git/branchdialog.cpp
- src/plugins/git/branchdialog.h 2 additions, 0 deletionssrc/plugins/git/branchdialog.h
- src/plugins/git/branchdialog.ui 90 additions, 43 deletionssrc/plugins/git/branchdialog.ui
- src/plugins/git/gitclient.cpp 20 additions, 3 deletionssrc/plugins/git/gitclient.cpp
- src/plugins/git/gitclient.h 5 additions, 1 deletionsrc/plugins/git/gitclient.h
Loading
Please register or sign in to comment