summaryrefslogtreecommitdiffstats
path: root/subcmds/rebase.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/rebase.py')
-rw-r--r--subcmds/rebase.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index db1b387c..d7e769ce 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -47,21 +47,18 @@ branch but need to incorporate new upstream changes "underneath" them.
47 g.add_option( 47 g.add_option(
48 "-i", 48 "-i",
49 "--interactive", 49 "--interactive",
50 dest="interactive",
51 action="store_true", 50 action="store_true",
52 help="interactive rebase (single project only)", 51 help="interactive rebase (single project only)",
53 ) 52 )
54 53
55 p.add_option( 54 p.add_option(
56 "--fail-fast", 55 "--fail-fast",
57 dest="fail_fast",
58 action="store_true", 56 action="store_true",
59 help="stop rebasing after first error is hit", 57 help="stop rebasing after first error is hit",
60 ) 58 )
61 p.add_option( 59 p.add_option(
62 "-f", 60 "-f",
63 "--force-rebase", 61 "--force-rebase",
64 dest="force_rebase",
65 action="store_true", 62 action="store_true",
66 help="pass --force-rebase to git rebase", 63 help="pass --force-rebase to git rebase",
67 ) 64 )
@@ -74,27 +71,23 @@ branch but need to incorporate new upstream changes "underneath" them.
74 ) 71 )
75 p.add_option( 72 p.add_option(
76 "--autosquash", 73 "--autosquash",
77 dest="autosquash",
78 action="store_true", 74 action="store_true",
79 help="pass --autosquash to git rebase", 75 help="pass --autosquash to git rebase",
80 ) 76 )
81 p.add_option( 77 p.add_option(
82 "--whitespace", 78 "--whitespace",
83 dest="whitespace",
84 action="store", 79 action="store",
85 metavar="WS", 80 metavar="WS",
86 help="pass --whitespace to git rebase", 81 help="pass --whitespace to git rebase",
87 ) 82 )
88 p.add_option( 83 p.add_option(
89 "--auto-stash", 84 "--auto-stash",
90 dest="auto_stash",
91 action="store_true", 85 action="store_true",
92 help="stash local modifications before starting", 86 help="stash local modifications before starting",
93 ) 87 )
94 p.add_option( 88 p.add_option(
95 "-m", 89 "-m",
96 "--onto-manifest", 90 "--onto-manifest",
97 dest="onto_manifest",
98 action="store_true", 91 action="store_true",
99 help="rebase onto the manifest version instead of upstream " 92 help="rebase onto the manifest version instead of upstream "
100 "HEAD (this helps to make sure the local tree stays " 93 "HEAD (this helps to make sure the local tree stays "