diff options
| author | Tobias Hunger <[email protected]> | 2010-10-01 16:33:23 +0200 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2010-10-05 12:30:24 +0200 |
| commit | 13b442f289af59cce87baa357758bb43fb7bf929 (patch) | |
| tree | 9b646b8d91732cb02f3c95f5093e3c45805f1a29 /src/plugins/git/settingspage.cpp | |
| parent | 6df84af9ffc0ec325c6334db36cac7bc506269ad (diff) | |
Git: ignore spaces in diff
Ignore spacing changes in diff (based on same setting as used to
ignore spacing in git blame).
Task-number: QTCREATORBUG-2526
Diffstat (limited to 'src/plugins/git/settingspage.cpp')
| -rw-r--r-- | src/plugins/git/settingspage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index e311239092a..93c27315053 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -74,7 +74,7 @@ GitSettings SettingsPageWidget::settings() const rc.pullRebase = m_ui.pullRebaseCheckBox->isChecked(); rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked(); rc.omitAnnotationDate = m_ui.omitAnnotationDataCheckBox->isChecked(); - rc.spaceIgnorantBlame = m_ui.spaceIgnorantBlameCheckBox->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(); @@ -90,7 +90,7 @@ void SettingsPageWidget::setSettings(const GitSettings &s) m_ui.pullRebaseCheckBox->setChecked(s.pullRebase); m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit); m_ui.omitAnnotationDataCheckBox->setChecked(s.omitAnnotationDate); - m_ui.spaceIgnorantBlameCheckBox->setChecked(s.spaceIgnorantBlame); + m_ui.spaceIgnorantBlameCheckBox->setChecked(s.ignoreSpaceChanges); m_ui.diffPatienceCheckBox->setChecked(s.diffPatience); m_ui.winHomeCheckBox->setChecked(s.winSetHomeEnvironment); m_ui.gitkOptionsLineEdit->setText(s.gitkOptions); |