From d33c40f167af6610143c318c25880019ecbd0421 Mon Sep 17 00:00:00 2001 From: Kirill Smelkov Date: Mon, 2 Jan 2006 14:26:02 +0300 Subject: [PATCH] [trivial] fix spelling typos From: Kirill Smelkov --- stgit/commands/pull.py | 2 +- stgit/commands/series.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py index 69b8d88..25832a5 100644 --- a/stgit/commands/pull.py +++ b/stgit/commands/pull.py @@ -29,7 +29,7 @@ usage = """%prog [options] [] [] Pull the latest changes from the given repository (defaulting to 'origin'). This command works by popping all the patches from the stack, pulling the changes in the parent repository, setting the base -of the stack to the latest parent HEAD and pusing the patches back +of the stack to the latest parent HEAD and pushing the patches back (unless '--nopush' is specified). The 'push' operation can fail if there are conflicts. They need to be resolved and the patch pushed again. diff --git a/stgit/commands/series.py b/stgit/commands/series.py index ec1aaaf..5710558 100644 --- a/stgit/commands/series.py +++ b/stgit/commands/series.py @@ -34,7 +34,7 @@ prefixed with a '>'. Empty patches are prefixed with a '0'.""" options = [make_option('-b', '--branch', help = 'use BRANCH instead of the default one'), make_option('-d', '--description', - help = 'show a show description for each patch', + help = 'show a short description for each patch', action = 'store_true'), make_option('-e', '--empty', help = 'check whether patches are empty ' -- 2.11.0