diff options
| author | Friedemann Kleint <[email protected]> | 2010-03-19 16:07:34 +0100 |
|---|---|---|
| committer | Friedemann Kleint <[email protected]> | 2010-03-19 16:07:34 +0100 |
| commit | bcd020f38209604ed96d44613b4e1c97b09dc615 (patch) | |
| tree | f8f26771c3500d7ea393ee276d79155823da8e61 /src/plugins/git/settingspage.cpp | |
| parent | 59d827c697d481f56baa6b2e19d104308b2a286a (diff) | |
VCS[git]: Introduce optional pull --rebase.
Do 'git rebase --abort' if something fails.
Diffstat (limited to 'src/plugins/git/settingspage.cpp')
| -rw-r--r-- | src/plugins/git/settingspage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index 3aa9e6c02ea..11edb065ce3 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -56,6 +56,7 @@ GitSettings SettingsPageWidget::settings() const rc.adoptPath = m_ui.environmentGroupBox->isChecked() && !rc.path.isEmpty(); rc.logCount = m_ui.logCountSpinBox->value(); 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.spaceIgnorantBlame = m_ui.spaceIgnorantBlameCheckBox->isChecked(); @@ -69,6 +70,7 @@ void SettingsPageWidget::setSettings(const GitSettings &s) m_ui.pathLineEdit->setText(s.path); m_ui.logCountSpinBox->setValue(s.logCount); 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.spaceIgnorantBlame); @@ -86,6 +88,7 @@ QString SettingsPageWidget::searchKeywords() const QTextStream(&rc) << ' ' << m_ui.pathlabel->text() << ' ' << m_ui.logCountLabel->text() << ' ' << m_ui.timeoutLabel->text() << ' ' << m_ui.promptToSubmitCheckBox->text() + << ' ' << m_ui.promptToSubmitCheckBox->text() << ' ' << m_ui.omitAnnotationDataCheckBox->text() << ' ' << m_ui.environmentGroupBox->title() << ' ' << m_ui.spaceIgnorantBlameCheckBox->text(); |