diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-03-06 00:46:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-06 00:46:45 +0000 |
| commit | 3ee6ffd07852c184feef5afd695d80a3f9a0db79 (patch) | |
| tree | 7e6e44db4a785a52579589f81de88fb16564c1f3 /subcmds/rebase.py | |
| parent | 28db6ffef48138fc97aca9fbf0d774ac26a41c70 (diff) | |
| parent | 2f9e7e40c44acae37d0c263c212956ef6038c35b (diff) | |
| download | git-repo-3ee6ffd07852c184feef5afd695d80a3f9a0db79.tar.gz | |
Merge "Fix: Missing spaces in printed messages"
Diffstat (limited to 'subcmds/rebase.py')
| -rw-r--r-- | subcmds/rebase.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 06cda22c..b9a7774d 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py | |||
| @@ -68,7 +68,7 @@ branch but need to incorporate new upstream changes "underneath" them. | |||
| 68 | cb = project.CurrentBranch | 68 | cb = project.CurrentBranch |
| 69 | if not cb: | 69 | if not cb: |
| 70 | if one_project: | 70 | if one_project: |
| 71 | print("error: project %s has a detatched HEAD" % project.relpath, | 71 | print("error: project %s has a detached HEAD" % project.relpath, |
| 72 | file=sys.stderr) | 72 | file=sys.stderr) |
| 73 | return -1 | 73 | return -1 |
| 74 | # ignore branches with detatched HEADs | 74 | # ignore branches with detatched HEADs |