6 git-pull - Fetch from and merge with another repository or a local branch
11 'git pull' [options] [<repository> [<refspec>...]]
17 Incorporates changes from a remote repository into the current
18 branch. In its default mode, `git pull` is shorthand for
19 `git fetch` followed by `git merge FETCH_HEAD`.
21 More precisely, 'git pull' runs 'git fetch' with the given
22 parameters and calls 'git merge' to merge the retrieved branch
23 heads into the current branch.
24 With `--rebase`, it runs 'git rebase' instead of 'git merge'.
26 <repository> should be the name of a remote repository as
27 passed to linkgit:git-fetch[1]. <refspec> can name an
28 arbitrary remote ref (for example, the name of a tag) or even
29 a collection of refs with corresponding remote-tracking branches
30 (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}),
31 but usually it is the name of a branch in the remote repository.
33 Default values for <repository> and <branch> are read from the
34 "remote" and "merge" configuration for the current branch
35 as set by linkgit:git-branch[1] `--track`.
37 Assume the following history exists and the current branch is
41 A---B---C master on origin
46 Then "`git pull`" will fetch and replay the changes from the remote
47 `master` branch since it diverged from the local `master` (i.e., `E`)
48 until its current commit (`C`) on top of `master` and record the
49 result in a new commit along with the names of the two parent commits
50 and a log message from the user describing the changes.
53 A---B---C remotes/origin/master
55 D---E---F---G---H master
58 See linkgit:git-merge[1] for details, including how conflicts
59 are presented and handled.
61 In git 1.7.0 or later, to cancel a conflicting merge, use
62 `git reset --merge`. *Warning*: In older versions of git, running 'git pull'
63 with uncommitted changes is discouraged: while possible, it leaves you
64 in a state that may be hard to back out of in the case of a conflict.
66 If any of the remote changes overlap with local uncommitted changes,
67 the merge will be automatically cancelled and the work tree untouched.
68 It is generally best to get any local changes in working order before
69 pulling or stash them away with linkgit:git-stash[1].
74 Options meant for 'git pull' itself and the underlying 'git merge'
75 must be given before the options meant for 'git fetch'.
79 This is passed to both underlying git-fetch to squelch reporting of
80 during transfer, and underlying git-merge to squelch output during
85 Pass --verbose to git-fetch and git-merge.
87 Options related to merging
88 ~~~~~~~~~~~~~~~~~~~~~~~~~~
90 include::merge-options.txt[]
95 Rebase the current branch on top of the upstream branch after
96 fetching. If there is a remote-tracking branch corresponding to
97 the upstream branch and the upstream branch was rebased since last
98 fetched, the rebase uses that information to avoid rebasing
101 See `branch.<name>.rebase` and `branch.autosetuprebase` in
102 linkgit:git-config[1] if you want to make `git pull` always use
103 `{litdd}rebase` instead of merging.
106 This is a potentially _dangerous_ mode of operation.
107 It rewrites history, which does not bode well when you
108 published that history already. Do *not* use this option
109 unless you have read linkgit:git-rebase[1] carefully.
112 Override earlier --rebase.
114 Options related to fetching
115 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
117 include::fetch-options.txt[]
119 include::pull-fetch-param.txt[]
121 include::urls-remotes.txt[]
123 include::merge-strategies.txt[]
128 Often people use `git pull` without giving any parameter.
129 Traditionally, this has been equivalent to saying `git pull
130 origin`. However, when configuration `branch.<name>.remote` is
131 present while on branch `<name>`, that value is used instead of
134 In order to determine what URL to use to fetch from, the value
135 of the configuration `remote.<origin>.url` is consulted
136 and if there is not any such variable, the value on `URL: ` line
137 in `$GIT_DIR/remotes/<origin>` file is used.
139 In order to determine what remote branches to fetch (and
140 optionally store in the remote-tracking branches) when the command is
141 run without any refspec parameters on the command line, values
142 of the configuration variable `remote.<origin>.fetch` are
143 consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>`
144 file is consulted and its `Pull: ` lines are used.
145 In addition to the refspec formats described in the OPTIONS
146 section, you can have a globbing refspec that looks like this:
149 refs/heads/*:refs/remotes/origin/*
152 A globbing refspec must have a non-empty RHS (i.e. must store
153 what were fetched in remote-tracking branches), and its LHS and RHS
154 must end with `/*`. The above specifies that all remote
155 branches are tracked using remote-tracking branches in
156 `refs/remotes/origin/` hierarchy under the same name.
158 The rule to determine which remote branch to merge after
159 fetching is a bit involved, in order not to break backward
162 If explicit refspecs were given on the command
163 line of `git pull`, they are all merged.
165 When no refspec was given on the command line, then `git pull`
166 uses the refspec from the configuration or
167 `$GIT_DIR/remotes/<origin>`. In such cases, the following
170 . If `branch.<name>.merge` configuration for the current
171 branch `<name>` exists, that is the name of the branch at the
172 remote site that is merged.
174 . If the refspec is a globbing one, nothing is merged.
176 . Otherwise the remote branch of the first refspec is merged.
182 * Update the remote-tracking branches for the repository
183 you cloned from, then merge one of them into your
186 ------------------------------------------------
187 $ git pull, git pull origin
188 ------------------------------------------------
190 Normally the branch merged in is the HEAD of the remote repository,
191 but the choice is determined by the branch.<name>.remote and
192 branch.<name>.merge options; see linkgit:git-config[1] for details.
194 * Merge into the current branch the remote branch `next`:
196 ------------------------------------------------
197 $ git pull origin next
198 ------------------------------------------------
200 This leaves a copy of `next` temporarily in FETCH_HEAD, but
201 does not update any remote-tracking branches. Using remote-tracking
202 branches, the same can be done by invoking fetch and merge:
204 ------------------------------------------------
206 $ git merge origin/next
207 ------------------------------------------------
210 If you tried a pull which resulted in a complex conflicts and
211 would want to start over, you can recover with 'git reset'.
216 linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
221 Written by Linus Torvalds <torvalds@osdl.org>
222 and Junio C Hamano <gitster@pobox.com>
226 Documentation by Jon Loeliger,
228 Junio C Hamano and the git-list <git@vger.kernel.org>.
232 Part of the linkgit:git[1] suite