Git: Add options to diff editor

1 files changed, 1 insertions, 9 deletions

diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index 93c27315053..423cd920c70 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -73,9 +73,6 @@ GitSettings SettingsPageWidget::settings() const
     rc.timeoutSeconds = m_ui.timeoutSpinBox->value();
     rc.pullRebase = m_ui.pullRebaseCheckBox->isChecked();
     rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked();
-    rc.omitAnnotationDate = m_ui.omitAnnotationDataCheckBox->isChecked();
-    rc.ignoreSpaceChanges = m_ui.spaceIgnorantBlameCheckBox->isChecked();
-    rc.diffPatience = m_ui.diffPatienceCheckBox->isChecked();
     rc.winSetHomeEnvironment = m_ui.winHomeCheckBox->isChecked();
     rc.gitkOptions = m_ui.gitkOptionsLineEdit->text().trimmed();
     return rc;
@@ -89,9 +86,6 @@ void SettingsPageWidget::setSettings(const GitSettings &s)
     m_ui.timeoutSpinBox->setValue(s.timeoutSeconds);
     m_ui.pullRebaseCheckBox->setChecked(s.pullRebase);
     m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit);
-    m_ui.omitAnnotationDataCheckBox->setChecked(s.omitAnnotationDate);
-    m_ui.spaceIgnorantBlameCheckBox->setChecked(s.ignoreSpaceChanges);
-    m_ui.diffPatienceCheckBox->setChecked(s.diffPatience);
     m_ui.winHomeCheckBox->setChecked(s.winSetHomeEnvironment);
     m_ui.gitkOptionsLineEdit->setText(s.gitkOptions);
 }
@@ -108,9 +102,7 @@ QString SettingsPageWidget::searchKeywords() const
         << ' ' << m_ui.timeoutLabel->text()
         << ' ' << m_ui.promptToSubmitCheckBox->text()
         << ' ' << m_ui.promptToSubmitCheckBox->text()
-        << ' ' << m_ui.omitAnnotationDataCheckBox->text()
-        << ' ' << m_ui.environmentGroupBox->title()
-        << ' ' << m_ui.spaceIgnorantBlameCheckBox->text();
+        << ' ' << m_ui.environmentGroupBox->title();
     rc.remove(QLatin1Char('&'));
     return rc;
 }