Signed-off-by: Yann Dirson <ydirson@xxxxxxxxxx>
---
stgit/commands/rebase.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index 8b7bca0..2951421 100644
--- a/stgit/commands/rebase.py
+++ b/stgit/commands/rebase.py
@@ -31,6 +31,9 @@ Pop all patches from current stack, move the stack base to the given
options = [make_option('-n', '--nopush',
help = 'do not push the patches back after rebasing',
+ action = 'store_true'),
+ make_option('-m', '--merged',
+ help = 'check for patches merged upstream',
action = 'store_true')]
def func(parser, options, args):
@@ -59,6 +62,6 @@ def func(parser, options, args):
# push the patches back
if not options.nopush:
- push_patches(applied)
+ push_patches(applied, options.merged)
print_crt_patch()
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html