From 2f206b8f3d65d506f58ee9a519b4d39aca6d31d1 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Sun, 18 Sep 2005 18:47:12 +0200 Subject: [PATCH] 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 --- stgit/commands/series.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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') ] -- 2.11.0