]>
Commit | Line | Data |
---|---|---|
0c04094b | 1 | <repository>:: |
bccf5956 | 2 | The "remote" repository that is the source of a fetch |
58124733 JF |
3 | or pull operation. This parameter can be either a URL |
4 | (see the section <<URLS,GIT URLS>> below) or the name | |
5 | of a remote (see the section <<REMOTES,REMOTES>> below). | |
ab9b3138 | 6 | |
9c4a036b BG |
7 | ifndef::git-pull[] |
8 | <group>:: | |
9 | A name referring to a list of repositories as the value | |
10 | of remotes.<group> in the configuration file. | |
11 | (See linkgit:git-config[1]). | |
12 | endif::git-pull[] | |
13 | ||
ab9b3138 | 14 | <refspec>:: |
db4e4113 MB |
15 | Specifies which refs to fetch and which local refs to update. |
16 | When no <refspec>s appear on the command line, the refs to fetch | |
17 | are read from `remote.<repository>.fetch` variables instead | |
18 | ifndef::git-pull[] | |
19 | (see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below). | |
20 | endif::git-pull[] | |
21 | ifdef::git-pull[] | |
f6a65de6 PB |
22 | (see the section "CONFIGURED REMOTE-TRACKING BRANCHES" |
23 | in linkgit:git-fetch[1]). | |
db4e4113 MB |
24 | endif::git-pull[] |
25 | + | |
26 | The format of a <refspec> parameter is an optional plus | |
83558a41 | 27 | `+`, followed by the source <src>, followed |
db4e4113 | 28 | by a colon `:`, followed by the destination ref <dst>. |
83558a41 JH |
29 | The colon can be omitted when <dst> is empty. <src> is |
30 | typically a ref, but it can also be a fully spelled hex object | |
31 | name. | |
df8baa42 | 32 | + |
5cc32687 JH |
33 | `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; |
34 | it requests fetching everything up to the given tag. | |
35 | + | |
3598a308 | 36 | The remote ref that matches <src> |
ae6a4703 ÆAB |
37 | is fetched, and if <dst> is not an empty string, an attempt |
38 | is made to update the local ref that matches it. | |
39 | + | |
40 | Whether that update is allowed without `--force` depends on the ref | |
41 | namespace it's being fetched to, the type of object being fetched, and | |
42 | whether the update is considered to be a fast-forward. Generally, the | |
43 | same rules apply for fetching as when pushing, see the `<refspec>...` | |
44 | section of linkgit:git-push[1] for what those are. Exceptions to those | |
45 | rules particular to 'git fetch' are noted below. | |
46 | + | |
0bc8d71b ÆAB |
47 | Until Git version 2.20, and unlike when pushing with |
48 | linkgit:git-push[1], any updates to `refs/tags/*` would be accepted | |
73e94796 | 49 | without `+` in the refspec (or `--force`). When fetching, we promiscuously |
0bc8d71b | 50 | considered all tag updates from a remote to be forced fetches. Since |
73e94796 | 51 | Git version 2.20, fetching to update `refs/tags/*` works the same way |
0bc8d71b ÆAB |
52 | as when pushing. I.e. any updates will be rejected without `+` in the |
53 | refspec (or `--force`). | |
ae6a4703 ÆAB |
54 | + |
55 | Unlike when pushing with linkgit:git-push[1], any updates outside of | |
56 | `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or | |
57 | `--force`), whether that's swapping e.g. a tree object for a blob, or | |
58 | a commit for another commit that's doesn't have the previous commit as | |
59 | an ancestor etc. | |
60 | + | |
0bc8d71b ÆAB |
61 | Unlike when pushing with linkgit:git-push[1], there is no |
62 | configuration which'll amend these rules, and nothing like a | |
63 | `pre-fetch` hook analogous to the `pre-receive` hook. | |
64 | + | |
ae6a4703 ÆAB |
65 | As with pushing with linkgit:git-push[1], all of the rules described |
66 | above about what's not allowed as an update can be overridden by | |
67 | adding an the optional leading `+` to a refspec (or using `--force` | |
68 | command line option). The only exception to this is that no amount of | |
69 | forcing will make the `refs/heads/*` namespace accept a non-commit | |
70 | object. | |
df8baa42 | 71 | + |
bccf5956 | 72 | [NOTE] |
f471dbc5 JH |
73 | When the remote branch you want to fetch is known to |
74 | be rewound and rebased regularly, it is expected that | |
75 | its new tip will not be descendant of its previous tip | |
76 | (as stored in your remote-tracking branch the last time | |
77 | you fetched). You would want | |
78 | to use the `+` sign to indicate non-fast-forward updates | |
79 | will be needed for such branches. There is no way to | |
80 | determine or declare that a branch will be made available | |
81 | in a repository with this behavior; the pulling user simply | |
bccf5956 | 82 | must know this is the expected usage pattern for a branch. |
5d59a32f | 83 | ifdef::git-pull[] |
bccf5956 JL |
84 | + |
85 | [NOTE] | |
fdd08979 | 86 | There is a difference between listing multiple <refspec> |
0b444cdb | 87 | directly on 'git pull' command line and having multiple |
5d59a32f JH |
88 | `remote.<repository>.fetch` entries in your configuration |
89 | for a <repository> and running a | |
0b444cdb | 90 | 'git pull' command without any explicit <refspec> parameters. |
5d59a32f | 91 | <refspec>s listed explicitly on the command line are always |
fdd08979 | 92 | merged into the current branch after fetching. In other words, |
5d59a32f JH |
93 | if you list more than one remote ref, 'git pull' will create |
94 | an Octopus merge. On the other hand, if you do not list any | |
95 | explicit <refspec> parameter on the command line, 'git pull' | |
96 | will fetch all the <refspec>s it finds in the | |
97 | `remote.<repository>.fetch` configuration and merge | |
98 | only the first <refspec> found into the current branch. | |
99 | This is because making an | |
fdd08979 JH |
100 | Octopus from remote refs is rarely done, while keeping track |
101 | of multiple remote heads in one-go by fetching more than one | |
102 | is often useful. | |
5d59a32f | 103 | endif::git-pull[] |