~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
ebc429e
)
Add --merged option to rebase.
author
Yann Dirson
<ydirson@altern.org>
Tue, 13 Feb 2007 22:26:36 +0000
(22:26 +0000)
committer
Catalin Marinas
<catalin.marinas@gmail.com>
Tue, 13 Feb 2007 22:26:36 +0000
(22:26 +0000)
Signed-off-by: Yann Dirson <ydirson@altern.org>
stgit/commands/rebase.py
patch
|
blob
|
blame
|
history
diff --git
a/stgit/commands/rebase.py
b/stgit/commands/rebase.py
index
8b7bca0
..
2951421
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',
+ 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()