From d7824bed566fc55b3b09930300ab4ce27017c5aa Mon Sep 17 00:00:00 2001 From: Jakub Wilk Date: Mon, 13 Jul 2015 18:38:22 +0200 Subject: Fix typos --- git-hub | 6 +++--- man.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/git-hub b/git-hub index 031a089..0e16bf9 100755 --- a/git-hub +++ b/git-hub @@ -172,7 +172,7 @@ GIT_CONFIG_PREFIX = 'hub.' # This error is thrown when a git command fails (if git prints something in # stderr, this is considered an error even if the return code is 0). The # `output` argument is really the stderr output only, the `output` name is -# preseved because that's how is it called in the parent class. +# preserved because that's how is it called in the parent class. class GitError (subprocess.CalledProcessError): def __init__(self, returncode, cmd, output): @@ -774,7 +774,7 @@ class CloneCmd (object): upstream)) if not repo['fork']: warnf('Repository {} is not a fork, just ' - 'clonning, upstream will not be set', + 'cloning, upstream will not be set', repo['full_name']) upstream = None else: @@ -1525,7 +1525,7 @@ class RebaseCmd (PullUtil): if args.pull is not None: if cls.rebasing(): die("Can't start a pull rebase while a " - "regular reabase is in progress") + "regular rebase is in progress") cls.start_rebase(args) else: args.pull = ongoing_rebase_pull_id diff --git a/man.rst b/man.rst index e365849..1bf6520 100644 --- a/man.rst +++ b/man.rst @@ -278,7 +278,7 @@ COMMANDS `attach` ISSUE [HEAD] Convert the issue identified by **ISSUE** to a pull request by attaching commits to it. The branch (or git ref) where your changes are - implementedhead can be optionally specified with **HEAD** (otherwise the + implemented can be optionally specified with **HEAD** (otherwise the current branch is used). This subcommand is very similar to the `new` subcommand, please refer to it for more details. @@ -377,7 +377,7 @@ COMMANDS Passes the **--all** option to stash. Is like **--stash-include-untracked** but the ignored files are stashed and cleaned in addition to the untracked files, which completely removes the - possibility of conflicts when checking out the pull request to reabase. + possibility of conflicts when checking out the pull request to rebase. \-D, --delete-branch Delete the pull request branch if the rebase was successful. This is @@ -426,7 +426,7 @@ from. These are the git config keys used: `hub.forkrepo` Your blessed repository fork. The format is */*. Used to set - the head for your pull requests. [defaul: */(upstream + the head for your pull requests. [default: */(upstream part)*] `hub.forkremote` -- cgit v1.2.3