projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
diff-tree -c: show a merge commit a bit more sensibly.
[git.git]
/
Documentation
/
git-pull.txt
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index
7ebb08d
..
3a7d385
100644
(file)
--- a/
Documentation/git-pull.txt
+++ b/
Documentation/git-pull.txt
@@
-20,21
+20,18
@@
Note that you can use `.` (current directory) as the
<repository> to pull from the local repository -- this is useful
when merging local branches into the current branch.
<repository> to pull from the local repository -- this is useful
when merging local branches into the current branch.
+
OPTIONS
-------
OPTIONS
-------
-include::
pull-fetch-param
.txt[]
+include::
merge-options
.txt[]
--a, \--append::
- Append ref names and object names of fetched refs to the
- existing contents of `$GIT_DIR/FETCH_HEAD`. Without this
- option old data in `$GIT_DIR/FETCH_HEAD` will be overwritten.
+include::fetch-options.txt[]
-include::
merge-pull-opts
.txt[]
+include::
pull-fetch-param
.txt[]
include::merge-strategies.txt[]
include::merge-strategies.txt[]
-
EXAMPLES
--------
EXAMPLES
--------
@@
-72,7
+69,7
@@
$ git fetch origin master:origin +pu:pu maint:maint
$ git pull . origin
------------------------------------------------
+
$ git pull . origin
------------------------------------------------
+
-Here, a typical `
$GIT_DIR
/remotes/origin` file from a
+Here, a typical `
.git
/remotes/origin` file from a
`git-clone` operation is used in combination with
command line options to `git-fetch` to first update
multiple branches of the local repository and then
`git-clone` operation is used in combination with
command line options to `git-fetch` to first update
multiple branches of the local repository and then
@@
-85,7
+82,7
@@
known to have already obtained and made available
all the necessary objects.
all the necessary objects.
-Pull of multiple branches from one repository using `
$GIT_DIR
/remotes` file::
+Pull of multiple branches from one repository using `
.git
/remotes` file::
+
------------------------------------------------
$ cat .git/remotes/origin
+
------------------------------------------------
$ cat .git/remotes/origin
@@
-98,7
+95,7
@@
$ git checkout master
$ git pull origin
------------------------------------------------
+
$ git pull origin
------------------------------------------------
+
-Here, a typical `
$GIT_DIR
/remotes/origin` file from a
+Here, a typical `
.git
/remotes/origin` file from a
`git-clone` operation has been hand-modified to include
the branch-mapping of additional remote and local
heads directly. A single `git-pull` operation while
`git-clone` operation has been hand-modified to include
the branch-mapping of additional remote and local
heads directly. A single `git-pull` operation while
@@
-107,6
+104,11
@@
merge the remote `origin` head into the current,
local `master` branch.
local `master` branch.
+If you tried a pull which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+
SEE ALSO
--------
gitlink:git-fetch[1], gitlink:git-merge[1]
SEE ALSO
--------
gitlink:git-fetch[1], gitlink:git-merge[1]