From: Paolo 'Blaisorblade' Giarrusso Date: Sun, 18 Sep 2005 16:47:12 +0000 (+0200) Subject: Fix series mismerge X-Git-Tag: v0.14.3~661 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/2f206b8f3d65d506f58ee9a519b4d39aca6d31d1 Fix series mismerge From: Paolo 'Blaisorblade' Giarrusso Mismerge with my addition of -e. Sorry for not pulling that time. Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- diff --git a/stgit/commands/series.py b/stgit/commands/series.py index 7ed88c0..032b89e 100644 --- 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', - 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') ]