From: Yann Dirson <ydirson@altern.org>
Date: Tue, 13 Feb 2007 22:26:36 +0000 (+0000)
Subject: Add --merged option to rebase.
X-Git-Tag: v0.14.3~338
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/d12efe4418029cb713b46875779cbc9a4aa16166?hp=ebc429e7b7e596a12e8255fadc397123893cec73

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 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()