]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-pull(1) |
2 | =========== | |
2cf565c5 DG |
3 | |
4 | NAME | |
5 | ---- | |
c3f0baac | 6 | git-pull - Fetch from and merge with another repository or a local branch |
2cf565c5 DG |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
37465016 | 11 | 'git-pull' <options> <repository> <refspec>... |
0c04094b | 12 | |
2cf565c5 DG |
13 | |
14 | DESCRIPTION | |
15 | ----------- | |
bccf5956 JL |
16 | Runs `git-fetch` with the given parameters, and calls `git-merge` |
17 | to merge the retrieved head(s) into the current branch. | |
ab9b3138 | 18 | |
bccf5956 | 19 | Note that you can use `.` (current directory) as the |
710c97db JH |
20 | <repository> to pull from the local repository -- this is useful |
21 | when merging local branches into the current branch. | |
0c04094b | 22 | |
93d69d86 | 23 | |
0c04094b JH |
24 | OPTIONS |
25 | ------- | |
93d69d86 | 26 | include::merge-options.txt[] |
2cf565c5 | 27 | |
93d69d86 | 28 | include::fetch-options.txt[] |
2cf565c5 | 29 | |
93d69d86 | 30 | include::pull-fetch-param.txt[] |
37465016 | 31 | |
37ba0561 | 32 | include::urls-remotes.txt[] |
37465016 | 33 | |
85a97d4e | 34 | include::merge-strategies.txt[] |
37465016 | 35 | |
cd67e4d4 JS |
36 | \--rebase:: |
37 | Instead of a merge, perform a rebase after fetching. | |
38 | *NOTE:* This is a potentially _dangerous_ mode of operation. | |
39 | It rewrites history, which does not bode well when you | |
40 | published that history already. Do *not* use this option | |
5162e697 | 41 | unless you have read linkgit:git-rebase[1] carefully. |
cd67e4d4 JS |
42 | |
43 | \--no-rebase:: | |
44 | Override earlier \--rebase. | |
45 | ||
9e2586ff JH |
46 | DEFAULT BEHAVIOUR |
47 | ----------------- | |
48 | ||
49 | Often people use `git pull` without giving any parameter. | |
50 | Traditionally, this has been equivalent to saying `git pull | |
51 | origin`. However, when configuration `branch.<name>.remote` is | |
52 | present while on branch `<name>`, that value is used instead of | |
53 | `origin`. | |
54 | ||
55 | In order to determine what URL to use to fetch from, the value | |
56 | of the configuration `remote.<origin>.url` is consulted | |
57 | and if there is not any such variable, the value on `URL: ` line | |
58 | in `$GIT_DIR/remotes/<origin>` file is used. | |
59 | ||
60 | In order to determine what remote branches to fetch (and | |
61 | optionally store in the tracking branches) when the command is | |
62 | run without any refspec parameters on the command line, values | |
63 | of the configuration variable `remote.<origin>.fetch` are | |
64 | consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` | |
65 | file is consulted and its `Pull: ` lines are used. | |
66 | In addition to the refspec formats described in the OPTIONS | |
67 | section, you can have a globbing refspec that looks like this: | |
68 | ||
69 | ------------ | |
70 | refs/heads/*:refs/remotes/origin/* | |
71 | ------------ | |
72 | ||
73 | A globbing refspec must have a non-empty RHS (i.e. must store | |
74 | what were fetched in tracking branches), and its LHS and RHS | |
75 | must end with `/*`. The above specifies that all remote | |
76 | branches are tracked using tracking branches in | |
77 | `refs/remotes/origin/` hierarchy under the same name. | |
78 | ||
79 | The rule to determine which remote branch to merge after | |
80 | fetching is a bit involved, in order not to break backward | |
81 | compatibility. | |
82 | ||
83 | If explicit refspecs were given on the command | |
84 | line of `git pull`, they are all merged. | |
85 | ||
86 | When no refspec was given on the command line, then `git pull` | |
87 | uses the refspec from the configuration or | |
88 | `$GIT_DIR/remotes/<origin>`. In such cases, the following | |
89 | rules apply: | |
90 | ||
91 | . If `branch.<name>.merge` configuration for the current | |
92 | branch `<name>` exists, that is the name of the branch at the | |
93 | remote site that is merged. | |
94 | ||
95 | . If the refspec is a globbing one, nothing is merged. | |
96 | ||
97 | . Otherwise the remote branch of the first refspec is merged. | |
98 | ||
99 | ||
37465016 JH |
100 | EXAMPLES |
101 | -------- | |
102 | ||
103 | git pull, git pull origin:: | |
33a59fd0 BF |
104 | Update the remote-tracking branches for the repository |
105 | you cloned from, then merge one of them into your | |
106 | current branch. Normally the branch merged in is | |
107 | the HEAD of the remote repository, but the choice is | |
108 | determined by the branch.<name>.remote and | |
5162e697 | 109 | branch.<name>.merge options; see linkgit:git-config[1] |
33a59fd0 BF |
110 | for details. |
111 | ||
112 | git pull origin next:: | |
113 | Merge into the current branch the remote branch `next`; | |
114 | leaves a copy of `next` temporarily in FETCH_HEAD, but | |
115 | does not update any remote-tracking branches. | |
37465016 JH |
116 | |
117 | git pull . fixes enhancements:: | |
118 | Bundle local branch `fixes` and `enhancements` on top of | |
c14261ea NP |
119 | the current branch, making an Octopus merge. This `git pull .` |
120 | syntax is equivalent to `git merge`. | |
37465016 | 121 | |
33a59fd0 BF |
122 | git pull -s ours . obsolete:: |
123 | Merge local branch `obsolete` into the current branch, | |
124 | using `ours` merge strategy. | |
125 | ||
37465016 JH |
126 | git pull --no-commit . maint:: |
127 | Merge local branch `maint` into the current branch, but | |
128 | do not make a commit automatically. This can be used | |
129 | when you want to include further changes to the merge, | |
130 | or want to write your own merge commit message. | |
131 | + | |
132 | You should refrain from abusing this option to sneak substantial | |
133 | changes into a merge commit. Small fixups like bumping | |
134 | release/version name would be acceptable. | |
135 | ||
bccf5956 JL |
136 | Command line pull of multiple branches from one repository:: |
137 | + | |
138 | ------------------------------------------------ | |
bccf5956 | 139 | $ git checkout master |
33a59fd0 BF |
140 | $ git fetch origin +pu:pu maint:tmp |
141 | $ git pull . tmp | |
bccf5956 JL |
142 | ------------------------------------------------ |
143 | + | |
33a59fd0 BF |
144 | This updates (or creates, as necessary) branches `pu` and `tmp` |
145 | in the local repository by fetching from the branches | |
146 | (respectively) `pu` and `maint` from the remote repository. | |
bccf5956 | 147 | + |
33a59fd0 BF |
148 | The `pu` branch will be updated even if it is does not |
149 | fast-forward; the others will not be. | |
bccf5956 | 150 | + |
33a59fd0 | 151 | The final command then merges the newly fetched `tmp` into master. |
bccf5956 | 152 | |
37465016 | 153 | |
3ae854c3 JH |
154 | If you tried a pull which resulted in a complex conflicts and |
155 | would want to start over, you can recover with | |
5162e697 | 156 | linkgit:git-reset[1]. |
3ae854c3 JH |
157 | |
158 | ||
fdd08979 JH |
159 | SEE ALSO |
160 | -------- | |
5162e697 | 161 | linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1] |
fdd08979 JH |
162 | |
163 | ||
2cf565c5 DG |
164 | Author |
165 | ------ | |
3f971fc4 JH |
166 | Written by Linus Torvalds <torvalds@osdl.org> |
167 | and Junio C Hamano <junkio@cox.net> | |
2cf565c5 DG |
168 | |
169 | Documentation | |
170 | -------------- | |
bccf5956 JL |
171 | Documentation by Jon Loeliger, |
172 | David Greaves, | |
173 | Junio C Hamano and the git-list <git@vger.kernel.org>. | |
2cf565c5 DG |
174 | |
175 | GIT | |
176 | --- | |
5162e697 | 177 | Part of the linkgit:git[7] suite |