Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py
- changeset 8259
- 2bbec88047dd
- parent 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8258:82b608e352ec | 8259:2bbec88047dd |
|---|---|
| 53 elif self.rebaseButton.isChecked(): | 53 elif self.rebaseButton.isChecked(): |
| 54 procedure = "--rebase" | 54 procedure = "--rebase" |
| 55 else: | 55 else: |
| 56 procedure = "--merge" | 56 procedure = "--merge" |
| 57 | 57 |
| 58 if self.remoteCheckBox.isChecked(): | 58 nofetch = (self.remoteCheckBox.isChecked() and |
| 59 nofetch = self.nofetchCheckBox.isChecked() | 59 self.nofetchCheckBox.isChecked()) |
| 60 else: | |
| 61 nofetch = False | |
| 62 | 60 |
| 63 return ( | 61 return ( |
| 64 procedure, | 62 procedure, |
| 65 self.initCheckBox.isChecked(), | 63 self.initCheckBox.isChecked(), |
| 66 self.remoteCheckBox.isChecked(), | 64 self.remoteCheckBox.isChecked(), |
