[PATCH 1/2] Add --merged option to rebase.

From

Yann Dirson <ydirson@altern.org>

Date

Feb 12, 2007, 21:08 UTC

Message-ID

<20070212210824.28413.71656.stgit@gandelf.nowhere.earth>

In-Reply-To

<20070212210628.28413.87407.stgit@gandelf.nowhere.earth>

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

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