diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-03 23:23:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 23:23:55 (GMT) |
| commit | b281796eeb925f5e91d27cd6c6c579c925577160 (patch) | |
| tree | 81a2a185c76af961dfa5145a30779b5f59170202 /Documentation/git-pull.txt | |
| parent | 1c2ab4303354da23ff74ce2ea4a99b69fcfae825 (diff) | |
| parent | 6079ec6680da5e40d15d981c24051e9bf5c226fc (diff) | |
| download | git-b281796eeb925f5e91d27cd6c6c579c925577160.zip git-b281796eeb925f5e91d27cd6c6c579c925577160.tar.gz git-b281796eeb925f5e91d27cd6c6c579c925577160.tar.bz2 | |
Merge branch 'maint' to sync with Git 1.7.3.3
* maint:
Git 1.7.3.3
CodingGuidelines: mention whitespace preferences for shell scripts
Documentation: do not misinterpret pull refspec as bold text
Conflicts:
Documentation/git-pull.txt
RelNotes
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e47361f..4db7373 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/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 |