From 5658eb69aafe324ef9c059c2b6d4d796b13f0cc1 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 19 Apr 2013 09:21:02 +0300
Subject: [PATCH] Git: Add Mixed reset (as default)

This is the default in Git

Change-Id: I65b5c0003a731799812d143d3142b58b30ddb878
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/logchangedialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp
index b8074707d51..3ba6458d980 100644
--- a/src/plugins/git/logchangedialog.cpp
+++ b/src/plugins/git/logchangedialog.cpp
@@ -72,6 +72,7 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent)
     if (isReset) {
         popUpLayout->addWidget(new QLabel(tr("Reset type:"), this));
         m_resetTypeComboBox = new QComboBox(this);
+        m_resetTypeComboBox->addItem(tr("Mixed"), QLatin1String("--mixed"));
         m_resetTypeComboBox->addItem(tr("Hard"), QLatin1String("--hard"));
         m_resetTypeComboBox->addItem(tr("Soft"), QLatin1String("--soft"));
         popUpLayout->addWidget(m_resetTypeComboBox);