diff options
| author | Leandro Lucarella <leandro.lucarella@sociomantic.com> | 2014-10-16 12:37:53 +0200 |
|---|---|---|
| committer | Mihails Strasuns <mihails.strasuns@sociomantic.com> | 2014-10-20 07:42:29 +0200 |
| commit | a6ecb7be0366f01e98699e89f9c81dea16673495 (patch) | |
| tree | a0bdebf9a580a65db70b345bd0b87f2246180062 | |
| parent | 4fd3fbdf0b81086fc40cbffc9d771d693563e48b (diff) | |
Mention how tracking branch is used in pull new/attach
When adding the tracking branch as a default pull base the man page was
updated but not the command-line help, which is a bit misleading.
| -rwxr-xr-x | git-hub | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1289,8 +1289,9 @@ class PullCmd (IssueCmd): "used as the optional body") parser.add_argument('-b', '--base', metavar='BASE', help="branch (or git ref) you want your " - "changes pulled into (uses hub.pullbase or " - "'master' in hub.upstream by default)") + "changes pulled into (uses the tracking " + "branch by default, or hub.pullbase if " + "there is none, or 'master' as a fallback)") parser.add_argument('-c', '--create-branch', metavar='NAME', help="create a new remote branch with NAME " @@ -1336,8 +1337,9 @@ class PullCmd (IssueCmd): "after attaching the code to it") parser.add_argument('-b', '--base', metavar='BASE', help="branch (or git ref) you want your " - "changes pulled into (uses hub.pullbase or " - "'master' in hub.upstream by default)") + "changes pulled into (uses the tracking " + "branch by default, or hub.pullbase if " + "there is none, or 'master' as a fallback)") parser.add_argument('-c', '--create-branch', metavar='NAME', help="create a new remote branch with NAME " |