projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mailinfo: ignore blanks after in-body headers.
[git.git]
/
Documentation
/
git-pull.txt
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index
c65ca9a
..
51577fc
100644
(file)
--- a/
Documentation/git-pull.txt
+++ b/
Documentation/git-pull.txt
@@
-3,7
+3,7
@@
git-pull(1)
NAME
----
NAME
----
-git-pull - Pull and merge from another repository
.
+git-pull - Pull and merge from another repository
SYNOPSIS
SYNOPSIS
@@
-29,8
+29,9
@@
include::fetch-options.txt[]
include::pull-fetch-param.txt[]
include::pull-fetch-param.txt[]
-include::
merge-strategie
s.txt[]
+include::
url
s.txt[]
+include::merge-strategies.txt[]
EXAMPLES
--------
EXAMPLES
--------
@@
-104,6
+105,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]