From 61420a2cb45c01e55d5bfc6abc632b9a41bb73a7 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Wed, 14 Sep 2005 16:48:05 +0400 Subject: [PATCH] Document git-fetch options Add documentation for git-fetch options Signed-off-by: Junio C Hamano --- Documentation/git-fetch.txt | 6 ++++++ Documentation/pull-fetch-param.txt | 11 +++++++++++ 2 files changed, 17 insertions(+) (limited to 'Documentation') diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 017f646601..8c1cc07048 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 8f6b68cb55..8642182c89 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -80,3 +80,14 @@ : when pulling/fetching, and : 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. -- cgit v1.2.3