diff options
Diffstat (limited to 'subcmds/rebase.py')
| -rw-r--r-- | subcmds/rebase.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py index cf536e9d..e0186d4d 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py | |||
| @@ -39,7 +39,8 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
| 39 | """ | 39 | """ |
| 40 | 40 | ||
| 41 | def _Options(self, p): | 41 | def _Options(self, p): |
| 42 | p.add_option('-i', '--interactive', | 42 | g = p.get_option_group('--quiet') |
| 43 | g.add_option('-i', '--interactive', | ||
| 43 | dest="interactive", action="store_true", | 44 | dest="interactive", action="store_true", |
| 44 | help="interactive rebase (single project only)") | 45 | help="interactive rebase (single project only)") |
| 45 | 46 | ||
| @@ -52,9 +53,6 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
| 52 | p.add_option('--no-ff', | 53 | p.add_option('--no-ff', |
| 53 | dest='ff', default=True, action='store_false', | 54 | dest='ff', default=True, action='store_false', |
| 54 | help='Pass --no-ff to git rebase') | 55 | help='Pass --no-ff to git rebase') |
| 55 | p.add_option('-q', '--quiet', | ||
| 56 | dest='quiet', action='store_true', | ||
| 57 | help='Pass --quiet to git rebase') | ||
| 58 | p.add_option('--autosquash', | 56 | p.add_option('--autosquash', |
| 59 | dest='autosquash', action='store_true', | 57 | dest='autosquash', action='store_true', |
| 60 | help='Pass --autosquash to git rebase') | 58 | help='Pass --autosquash to git rebase') |
