X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fpull-fetch-param.txt;h=8642182c89109b50eecc741cc71dde90f27d9048;hb=8ac93bc98f5e868e890e1a740df9f0c6513189c8;hp=ea0ad2c48f56211139d9b0e3100bf975f0be7e87;hpb=434d6ba03122c160f98713a009cf8a32d02982f3;p=git.git diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index ea0ad2c4..8642182c 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -49,7 +49,7 @@ :: The canonical format of a parameter is - +?:; that is, an optional plus '+', followed + '+?:'; that is, an optional plus '+', followed by the source ref, followed by a colon ':', followed by the destination ref. @@ -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.