1 files changed, 36 insertions, 43 deletions
diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui
index 26b51f527f..5e010df2a3 100644
--- a/src/plugins/git/settingspage.ui
+++ b/src/plugins/git/settingspage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>705</width>
-    <height>436</height>
+    <height>459</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -60,32 +60,25 @@
       <string>Miscellaneous</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="logCountLabel">
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="pullRebaseCheckBox">
         <property name="text">
-         <string>Log count:</string>
+         <string>Pull with rebase</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="logCountSpinBox">
-        <property name="toolTip">
-         <string>Note that huge amount of commits might take some time.</string>
-        </property>
-        <property name="maximum">
-         <number>1000</number>
-        </property>
-        <property name="value">
-         <number>1000</number>
+      <item row="0" column="4">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="timeoutLabel">
-        <property name="text">
-         <string>Timeout:</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>211</width>
+          <height>20</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
       <item row="0" column="3">
        <widget class="QSpinBox" name="timeoutSpinBox">
@@ -103,19 +96,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="4">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>211</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="1" column="0" colspan="2">
        <widget class="QCheckBox" name="promptToSubmitCheckBox">
         <property name="text">
@@ -123,24 +103,37 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QCheckBox" name="pullRebaseCheckBox">
+      <item row="0" column="0">
+       <widget class="QLabel" name="logCountLabel">
         <property name="text">
-         <string>Pull with rebase</string>
+         <string>Log count:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" colspan="2">
-       <widget class="QCheckBox" name="showTagsCheckBox">
+      <item row="0" column="2">
+       <widget class="QLabel" name="timeoutLabel">
         <property name="text">
-         <string>Show tags in Branches dialog</string>
+         <string>Timeout:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="logCountSpinBox">
+        <property name="toolTip">
+         <string>Note that huge amount of commits might take some time.</string>
+        </property>
+        <property name="maximum">
+         <number>1000</number>
+        </property>
+        <property name="value">
+         <number>1000</number>
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QCheckBox" name="useDiffEditorCheckBox">
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="showTagsCheckBox">
         <property name="text">
-         <string>Show diff side-by-side</string>
+         <string>Show tags in Branches dialog</string>
         </property>
        </widget>
       </item>