Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #140

Closed
wants to merge 1 commit into from
Closed

Fix typos #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions git-hub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions man.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -426,7 +426,7 @@ from. These are the git config keys used:

`hub.forkrepo`
Your blessed repository fork. The format is *<owner>/<project>*. Used to set
the head for your pull requests. [defaul: *<username>/(upstream <project>
the head for your pull requests. [default: *<username>/(upstream <project>
part)*]

`hub.forkremote`
Expand Down