projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 215a7ad1 JH |
1 | git-pull(1) |
| 2 | =========== | |
| 3f971fc4 | 3 | v0.99.4, Aug 2005 |
| 2cf565c5 DG |
4 | |
| 5 | NAME | |
| 6 | ---- | |
| 215a7ad1 | 7 | git-pull - Pull and merge from another repository. |
| 2cf565c5 DG |
8 | |
| 9 | ||
| 10 | SYNOPSIS | |
| 11 | -------- | |
| 215a7ad1 | 12 | 'git-pull' <repository> <refspec>... |
| 0c04094b | 13 | |
| 2cf565c5 DG |
14 | |
| 15 | DESCRIPTION | |
| 16 | ----------- | |
| 215a7ad1 | 17 | Runs 'git-fetch' with the given parameters. |
| ab9b3138 JH |
18 | |
| 19 | When only one ref is downloaded, runs 'git resolve' to merge it | |
| 20 | into the local HEAD. Otherwise uses 'git octopus' to merge them | |
| 21 | into the local HEAD. | |
| 0c04094b JH |
22 | |
| 23 | ||
| 24 | OPTIONS | |
| 25 | ------- | |
| 26 | include::pull-fetch-param.txt[] | |
| 2cf565c5 DG |
27 | |
| 28 | ||
| 29 | Author | |
| 30 | ------ | |
| 3f971fc4 JH |
31 | Written by Linus Torvalds <torvalds@osdl.org> |
| 32 | and Junio C Hamano <junkio@cox.net> | |
| 2cf565c5 DG |
33 | |
| 34 | Documentation | |
| 35 | -------------- | |
| 36 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
| 37 | ||
| 38 | GIT | |
| 39 | --- | |
| a7154e91 | 40 | Part of the gitlink:git[7] suite |
| 2cf565c5 | 41 |