diff options
Diffstat (limited to 'gbp/git')
-rw-r--r-- | gbp/git/modifier.py | 2 | ||||
-rw-r--r-- | gbp/git/repository.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gbp/git/modifier.py b/gbp/git/modifier.py index fd25d93..847c4e6 100644 --- a/gbp/git/modifier.py +++ b/gbp/git/modifier.py @@ -141,7 +141,7 @@ class GitModifier(object): >>> g.get_committer_env()['GIT_COMMITTER_NAME'] 'Joey Ramone' - @return: Commiter information suitable to use as environment variables + @return: Committer information suitable to use as environment variables @rtype: C{dict} """ return self._get_env('committer') diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 171518d..7373a67 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -264,7 +264,7 @@ class GitRepository(object): @property def bare(self): - """Wheter this is a bare repository""" + """Whether this is a bare repository""" return self._bare @property @@ -440,7 +440,7 @@ class GitRepository(object): @type commit: C{str} @param verbose: whether to print a summary after the merge @type verbose: C{bool} - @param edit: wheter to invoke an editor to edit the merge message + @param edit: whether to invoke an editor to edit the merge message @type edit: C{bool} """ args = GitArgs() @@ -1440,7 +1440,7 @@ class GitRepository(object): cur = None else: raise - else: # emtpy repo + else: # empty repo cur = None branch = 'master' |