diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-05 06:20:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-05 06:20:48 +0000 |
| commit | 2e6ded8990e867c457680899597363f3c1dd07f6 (patch) | |
| tree | a8b3625c96ffe486511441a9944dfcfe3231bf40 /git-pull.txt | |
| parent | d3dc64968e5141a389eeb491876e2aab1da90c24 (diff) | |
| download | git-htmldocs-2e6ded8990e867c457680899597363f3c1dd07f6.tar.gz | |
Autogenerated HTML docs for v1.7.3.3-398-g0b0cd
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.txt b/git-pull.txt index e47361f23..4db73737b 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -27,8 +27,8 @@ With `--rebase`, it runs 'git rebase' instead of 'git merge'. passed to linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches -(e.g., refs/heads/*:refs/remotes/origin/*), but usually it is -the name of a branch in the remote repository. +(e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), +but usually it is the name of a branch in the remote repository. Default values for <repository> and <branch> are read from the "remote" and "merge" configuration for the current branch |