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
/
fetch-options.txt
diff --git
a/Documentation/fetch-options.txt
b/Documentation/fetch-options.txt
index
a25d04a
..
200c9b2
100644
(file)
--- a/
Documentation/fetch-options.txt
+++ b/
Documentation/fetch-options.txt
@@
-4,6
+4,11
@@
option old data in `.git/FETCH_HEAD` will be overwritten.
-f, \--force::
option old data in `.git/FETCH_HEAD` will be overwritten.
-f, \--force::
+ When `git-fetch` is used with `<rbranch>:<lbranch>`
+ refspec, it refuses to update the local branch
+ `<lbranch>` unless the remote branch `<rbranch>` it
+ fetches is a descendant of `<lbranch>`. This option
+ overrides that check.
-t, \--tags::
By default, the git core utilities will not fetch and store
-t, \--tags::
By default, the git core utilities will not fetch and store