diff options
Diffstat (limited to 'subcmds/rebase.py')
-rw-r--r-- | subcmds/rebase.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py index dcb8b2a3..eb92a3c7 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py | |||
@@ -43,8 +43,8 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
43 | 43 | ||
44 | def _Options(self, p): | 44 | def _Options(self, p): |
45 | p.add_option('-i', '--interactive', | 45 | p.add_option('-i', '--interactive', |
46 | dest="interactive", action="store_true", | 46 | dest="interactive", action="store_true", |
47 | help="interactive rebase (single project only)") | 47 | help="interactive rebase (single project only)") |
48 | 48 | ||
49 | p.add_option('--fail-fast', | 49 | p.add_option('--fail-fast', |
50 | dest='fail_fast', action='store_true', | 50 | dest='fail_fast', action='store_true', |
@@ -82,7 +82,7 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
82 | file=sys.stderr) | 82 | file=sys.stderr) |
83 | if len(args) == 1: | 83 | if len(args) == 1: |
84 | print('note: project %s is mapped to more than one path' % (args[0],), | 84 | print('note: project %s is mapped to more than one path' % (args[0],), |
85 | file=sys.stderr) | 85 | file=sys.stderr) |
86 | return 1 | 86 | return 1 |
87 | 87 | ||
88 | # Setup the common git rebase args that we use for all projects. | 88 | # Setup the common git rebase args that we use for all projects. |