Add --merged option to rebase.

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index 8b7bca01a3529508a75e41150fe85d5a684823a5..295142161eb6c164c782895b842939384ae98d65 100644 (file)
--- 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',
 
 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):
                        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 the patches back
     if not options.nopush:

-        push_patches(applied)
+        push_patches(applied, options.merged)

 
     print_crt_patch()
 
     print_crt_patch()