1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-fetch(1)</title>
\r
264 git-fetch(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Download objects and a head from another repository.
\r
274 <div class="sectionbody">
\r
275 <p><em>git-fetch</em> <options> <repository> <refspec>…</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Fetches named heads or tags from another repository, along with
\r
280 the objects necessary to complete them.</p>
\r
281 <p>The ref names and their object names of fetched refs are stored
\r
282 in <tt>.git/FETCH_HEAD</tt>. This information is left for a later merge
\r
283 operation done by "git merge".</p>
\r
286 <div class="sectionbody">
\r
293 Append ref names and object names of fetched refs to the
\r
294 existing contents of <tt>.git/FETCH_HEAD</tt>. Without this
\r
295 option old data in <tt>.git/FETCH_HEAD</tt> will be overwritten.
\r
303 When <tt>git-fetch</tt> is used with <tt><rbranch>:<lbranch></tt>
\r
304 refspec, it refuses to update the local branch
\r
305 <tt><lbranch></tt> unless the remote branch <tt><rbranch></tt> it
\r
306 fetches is a descendant of <tt><lbranch></tt>. This option
\r
307 overrides that check.
\r
315 By default, the git core utilities will not fetch and store
\r
316 tags under the same name as the remote repository; ask it
\r
317 to do so using <tt>--tags</tt>. Using this option will bound the
\r
318 list of objects pulled to the remote tags. Commits in branches
\r
319 beyond the tags will be ignored.
\r
323 -u, --update-head-ok
\r
327 By default <tt>git-fetch</tt> refuses to update the head which
\r
328 corresponds to the current branch. This flag disables the
\r
329 check. Note that fetching into the current branch will not
\r
330 update the index and working directory, so use it with care.
\r
338 The "remote" repository that is the source of a fetch
\r
339 or pull operation, or the destination of a push operation.
\r
340 One of the following notations can be used
\r
341 to name the remote repository:
\r
343 <div class="exampleblock">
\r
344 <div class="exampleblock-content">
\r
348 rsync://host.xz/path/to/repo.git/
\r
353 http://host.xz/path/to/repo.git/
\r
358 https://host.xz/path/to/repo.git/
\r
363 git://host.xz/path/to/repo.git/
\r
368 git://host.xz/~user/path/to/repo.git/
\r
373 ssh://host.xz/path/to/repo.git/
\r
378 ssh://host.xz/~user/path/to/repo.git/
\r
383 ssh://host.xz/~/path/to/repo.git
\r
388 <p>SSH Is the default transport protocol and also supports an
\r
389 scp-like syntax. Both syntaxes support username expansion,
\r
390 as does the native git protocol. The following three are
\r
391 identical to the last three above, respectively:</p>
\r
392 <div class="exampleblock">
\r
393 <div class="exampleblock-content">
\r
397 host.xz:/path/to/repo.git/
\r
402 host.xz:~user/path/to/repo.git/
\r
407 host.xz:path/to/repo.git
\r
412 <p>To sync with a local directory, use:</p>
\r
413 <div class="exampleblock">
\r
414 <div class="exampleblock-content">
\r
423 <p>In addition to the above, as a short-hand, the name of a
\r
424 file in <tt>$GIT_DIR/remotes</tt> directory can be given; the
\r
425 named file should be in the following format:</p>
\r
426 <div class="literalblock">
\r
427 <div class="content">
\r
428 <pre><tt>URL: one of the above URL format
\r
429 Push: <refspec>
\r
430 Pull: <refspec></tt></pre>
\r
432 <p>When such a short-hand is specified in place of
\r
433 <repository> without <refspec> parameters on the command
\r
434 line, <refspec> specified on <tt>Push:</tt> lines or <tt>Pull:</tt>
\r
435 lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,
\r
436 respectively. Multiple <tt>Push:</tt> and and <tt>Pull:</tt> lines may
\r
437 be specified for additional branch mappings.</p>
\r
438 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be
\r
439 specified as an older notation short-hand; the named
\r
440 file should contain a single line, a URL in one of the
\r
441 above formats, optionally followed by a hash <tt>#</tt> and the
\r
442 name of remote head (URL fragment notation).
\r
443 <tt>$GIT_DIR/branches/<remote></tt> file that stores a <url>
\r
444 without the fragment is equivalent to have this in the
\r
445 corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>
\r
446 <div class="literalblock">
\r
447 <div class="content">
\r
448 <pre><tt>URL: <url>
\r
449 Pull: refs/heads/master:<remote></tt></pre>
\r
451 <p>while having <tt><url>#<head></tt> is equivalent to</p>
\r
452 <div class="literalblock">
\r
453 <div class="content">
\r
454 <pre><tt>URL: <url>
\r
455 Pull: refs/heads/<head>:<remote></tt></pre>
\r
463 The canonical format of a <refspec> parameter is
\r
464 <tt>+?<src>:<dst></tt>; that is, an optional plus <tt>+</tt>, followed
\r
465 by the source ref, followed by a colon <tt>:</tt>, followed by
\r
466 the destination ref.
\r
468 <p>When used in <tt>git-push</tt>, the <src> side can be an
\r
469 arbitrary "SHA1 expression" that can be used as an
\r
470 argument to <tt>git-cat-file -t</tt>. E.g. <tt>master~4</tt> (push
\r
471 four parents before the current master head).</p>
\r
472 <p>For <tt>git-push</tt>, the local ref that matches <src> is used
\r
473 to fast forward the remote ref that matches <dst>. If
\r
474 the optional plus <tt>+</tt> is used, the remote ref is updated
\r
475 even if it does not result in a fast forward update.</p>
\r
476 <p>For <tt>git-fetch</tt> and <tt>git-pull</tt>, the remote ref that matches <src>
\r
477 is fetched, and if <dst> is not empty string, the local
\r
478 ref that matches it is fast forwarded using <src>.
\r
479 Again, if the optional plus <tt>+</tt> is used, the local ref
\r
480 is updated even if it does not result in a fast forward
\r
482 <div class="admonitionblock">
\r
485 <div class="title">Note</div>
\r
487 <td class="content">If the remote branch from which you want to pull is
\r
488 modified in non-linear ways such as being rewound and
\r
489 rebased frequently, then a pull will attempt a merge with
\r
490 an older version of itself, likely conflict, and fail.
\r
491 It is under these conditions that you would want to use
\r
492 the <tt>+</tt> sign to indicate non-fast-forward updates will
\r
493 be needed. There is currently no easy way to determine
\r
494 or declare that a branch will be made available in a
\r
495 repository with this behavior; the pulling user simply
\r
496 must know this is the expected usage pattern for a branch.</td>
\r
499 <div class="admonitionblock">
\r
502 <div class="title">Note</div>
\r
504 <td class="content">You never do your own development on branches that appear
\r
505 on the right hand side of a <refspec> colon on <tt>Pull:</tt> lines;
\r
506 they are to be updated by <tt>git-fetch</tt>. If you intend to do
\r
507 development derived from a remote branch <tt>B</tt>, have a <tt>Pull:</tt>
\r
508 line to track it (i.e. <tt>Pull: B:remote-B</tt>), and have a separate
\r
509 branch <tt>my-B</tt> to do your development on top of it. The latter
\r
510 is created by <tt>git branch my-B remote-B</tt> (or its equivalent <tt>git
\r
511 checkout -b my-B remote-B</tt>). Run <tt>git fetch</tt> to keep track of
\r
512 the progress of the remote side, and when you see something new
\r
513 on the remote branch, merge it into your development branch with
\r
514 <tt>git pull . remote-B</tt>, while you are on <tt>my-B</tt> branch.
\r
515 The common <tt>Pull: master:origin</tt> mapping of a remote <tt>master</tt>
\r
516 branch to a local <tt>origin</tt> branch, which is then merged to a
\r
517 local development branch, again typically named <tt>master</tt>, is made
\r
518 when you run <tt>git clone</tt> for you to follow this pattern.</td>
\r
521 <div class="admonitionblock">
\r
524 <div class="title">Note</div>
\r
526 <td class="content">There is a difference between listing multiple <refspec>
\r
527 directly on <tt>git-pull</tt> command line and having multiple
\r
528 <tt>Pull:</tt> <refspec> lines for a <repository> and running
\r
529 <tt>git-pull</tt> command without any explicit <refspec> parameters.
\r
530 <refspec> listed explicitly on the command line are always
\r
531 merged into the current branch after fetching. In other words,
\r
532 if you list more than one remote refs, you would be making
\r
533 an Octopus. While <tt>git-pull</tt> run without any explicit <refspec>
\r
534 parameter takes default <refspec>s from <tt>Pull:</tt> lines, it
\r
535 merges only the first <refspec> found into the current branch,
\r
536 after fetching all the remote refs. This is because making an
\r
537 Octopus from remote refs is rarely done, while keeping track
\r
538 of multiple remote heads in one-go by fetching more than one
\r
539 is often useful.</td>
\r
542 <p>Some short-cut notations are also supported.</p>
\r
546 For backward compatibility, <tt>tag</tt> is almost ignored;
\r
547 it just makes the following parameter <tag> to mean a
\r
548 refspec <tt>refs/tags/<tag>:refs/tags/<tag></tt>.
\r
553 A parameter <ref> without a colon is equivalent to
\r
554 <ref>: when pulling/fetching, and <ref><tt>:</tt><ref> when
\r
555 pushing. That is, do not store it locally if
\r
556 fetching, and update the same name if pushing.
\r
564 <div class="sectionbody">
\r
565 <p><a href="git-pull.html">git-pull(1)</a></p>
\r
568 <div class="sectionbody">
\r
569 <p>Written by Linus Torvalds <torvalds@osdl.org> and
\r
570 Junio C Hamano <junkio@cox.net></p>
\r
572 <h2>Documentation</h2>
\r
573 <div class="sectionbody">
\r
574 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
577 <div class="sectionbody">
\r
578 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
581 <div id="footer-text">
\r
582 Last updated 27-Dec-2005 00:16:06 PDT
\r