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

Git: Added Merge and Rebase

Browse Source 
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>
This commit is contained in:
Petar Perisin
2012-12-21 23:49:29 +01:00
committed by Tobias Hunger
parent 2396f34fda
commit 7df112b687
5 changed files with 156 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/plugins/git/branchdialog.ui
View File

@@ -51,17 +51,14 @@
<property name="title">
<string>Branches</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="topMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<property name="verticalSpacing">
<number>9</number>
</property>
<item row="0" column="0" colspan="3">
<item>
<widget class="QTreeView" name="branchView">
<property name="rootIsDecorated">
<bool>false</bool>
@@ -74,40 +71,95 @@
</attribute>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="addButton">
<property name="text">
<string>&amp;Add...</string>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>15</number>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="removeButton">
<property name="text">
<string>&amp;Remove</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="diffButton">
<property name="text">
<string>&amp;Diff</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="logButton">
<property name="text">
<string>&amp;Log</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="checkoutButton">
<property name="text">
<string>&amp;Checkout</string>
</property>
</widget>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QPushButton" name="addButton">
<property name="text">
<string>&amp;Add...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeButton">
<property name="text">
<string>&amp;Remove</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="checkoutButton">
<property name="text">
<string>&amp;Checkout</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QPushButton" name="diffButton">
<property name="text">
<string>&amp;Diff</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="logButton">
<property name="text">
<string>&amp;Log</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QPushButton" name="mergeButton">
<property name="text">
<string>&amp;Merge</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="rebaseButton">
<property name="text">
<string>Re&amp;base</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
@@ -126,11 +178,6 @@
</widget>
<tabstops>
<tabstop>branchView</tabstop>
<tabstop>addButton</tabstop>
<tabstop>checkoutButton</tabstop>
<tabstop>removeButton</tabstop>
<tabstop>diffButton</tabstop>
<tabstop>logButton</tabstop>
<tabstop>buttonBox</tabstop>
<tabstop>refreshButton</tabstop>
</tabstops>