projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
merge-recursive: conflicting rename case.
[git.git]
/
Documentation
/
git-fetch.txt
diff --git
a/Documentation/git-fetch.txt
b/Documentation/git-fetch.txt
index
438240c
..
d1b45f9
100644
(file)
--- a/
Documentation/git-fetch.txt
+++ b/
Documentation/git-fetch.txt
@@
-18,7
+18,7
@@
the objects necessary to complete them.
The ref names and their object names of fetched refs are stored
in `.git/FETCH_HEAD`. This information is left for a later merge
-operation done by "git
resolve" or "git octopus
".
+operation done by "git
merge
".
OPTIONS