~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix series mismerge
[stgit]
/
stgit
/
commands
/
series.py
diff --git
a/stgit/commands/series.py
b/stgit/commands/series.py
index
7ed88c0
..
032b89e
100644
(file)
--- a/
stgit/commands/series.py
+++ b/
stgit/commands/series.py
@@
-32,8
+32,8
@@
with a '+' and the unapplied ones with a '-'. The current patch is
prefixed with a '>'. Empty patches are prefixed with a '0'."""
options = [make_option('-b', '--branch',
prefixed with a '>'. Empty patches are prefixed with a '0'."""
options = [make_option('-b', '--branch',
- help = 'use BRANCH instead of the default one')
]
-
options = [
make_option('-e', '--empty',
+ help = 'use BRANCH instead of the default one')
,
+
make_option('-e', '--empty',
help = 'check whether patches are empty '
'(much slower)',
action = 'store_true') ]
help = 'check whether patches are empty '
'(much slower)',
action = 'store_true') ]