summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-09-14 12:48:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-15 20:16:31 (GMT)
commit61420a2cb45c01e55d5bfc6abc632b9a41bb73a7 (patch)
tree66403671f1045aa1478e8b5210f91497b0ffd8b8 /Documentation
parent60d0526aaa5d29589420bfadd0623ec878c5edf3 (diff)
downloadgit-61420a2cb45c01e55d5bfc6abc632b9a41bb73a7.zip
git-61420a2cb45c01e55d5bfc6abc632b9a41bb73a7.tar.gz
git-61420a2cb45c01e55d5bfc6abc632b9a41bb73a7.tar.bz2
[PATCH] Document git-fetch options
Add documentation for git-fetch options Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fetch.txt6
-rw-r--r--Documentation/pull-fetch-param.txt11
2 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 017f646..8c1cc07 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -26,6 +26,12 @@ OPTIONS
-------
include::pull-fetch-param.txt[]
+-u, \--update-head-ok::
+ By default 'git-fetch' refuses to update the head which
+ corresponds to the current branch. This flag disables the
+ check. Note that fetching into the current branch will not
+ update the index and working directory, so use it with care.
+
Author
------
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 8f6b68c..8642182 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -80,3 +80,14 @@
<ref>: when pulling/fetching, and <ref>:<ref> when
pushing. That is, do not store it locally if
fetching, and update the same name if pushing.
+
+-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.
+
+-f, \--force::
+ Usually, the command refuses to update a local ref that is
+ not an ancestor of the remote ref used to overwrite it.
+ This flag disables the check. What this means is that the
+ local repository can lose commits; use it with care.