From: Paolo 'Blaisorblade' Giarrusso Date: Sun, 18 Sep 2005 16:47:12 GMT Subject: [PATCH] Fix series mismerge Message-ID: <20050918164712.13735.86782.stgit@zion.home.lan> From: Paolo 'Blaisorblade' Giarrusso Mismerge with my addition of -e. Sorry for not pulling that time. Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- stgit/commands/series.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stgit/commands/series.py b/stgit/commands/series.py --- a/stgit/commands/series.py +++ b/stgit/commands/series.py @@ -32,8 +32,8 @@ with a '+' and the unapplied ones with a 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') ]