projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 215a7ad1 JH |
1 | git-pull(1) |
| 2 | =========== | |
| 2cf565c5 DG |
3 | |
| 4 | NAME | |
| 5 | ---- | |
| 215a7ad1 | 6 | git-pull - Pull and merge from another repository. |
| 2cf565c5 DG |
7 | |
| 8 | ||
| 9 | SYNOPSIS | |
| 10 | -------- | |
| 215a7ad1 | 11 | 'git-pull' <repository> <refspec>... |
| 0c04094b | 12 | |
| 2cf565c5 DG |
13 | |
| 14 | DESCRIPTION | |
| 15 | ----------- | |
| 215a7ad1 | 16 | Runs 'git-fetch' with the given parameters. |
| ab9b3138 JH |
17 | |
| 18 | When only one ref is downloaded, runs 'git resolve' to merge it | |
| 19 | into the local HEAD. Otherwise uses 'git octopus' to merge them | |
| 20 | into the local HEAD. | |
| 0c04094b | 21 | |
| 710c97db JH |
22 | Note that you can use '.' (current directory) as the |
| 23 | <repository> to pull from the local repository -- this is useful | |
| 24 | when merging local branches into the current branch. | |
| 0c04094b JH |
25 | |
| 26 | OPTIONS | |
| 27 | ------- | |
| 28 | include::pull-fetch-param.txt[] | |
| 2cf565c5 | 29 | |
| d6a73596 JH |
30 | -a, \--append:: |
| 31 | Append ref names and object names of fetched refs to the | |
| 32 | existing contents of $GIT_DIR/FETCH_HEAD. Without this | |
| 33 | option old data in $GIT_DIR/FETCH_HEAD will be overwritten. | |
| 2cf565c5 DG |
34 | |
| 35 | Author | |
| 36 | ------ | |
| 3f971fc4 JH |
37 | Written by Linus Torvalds <torvalds@osdl.org> |
| 38 | and Junio C Hamano <junkio@cox.net> | |
| 2cf565c5 DG |
39 | |
| 40 | Documentation | |
| 41 | -------------- | |
| 42 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
| 43 | ||
| 44 | GIT | |
| 45 | --- | |
| a7154e91 | 46 | Part of the gitlink:git[7] suite |
| 2cf565c5 | 47 |