summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4dab94d)
raw | patch | inline | side by side (parent: 4dab94d)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 20 Oct 2005 04:25:39 +0000 (21:25 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 20 Oct 2005 04:25:39 +0000 (21:25 -0700) |
The documentation was lazily sharing the argument description across these
commands.
Lazy may be a way of life, but that does not justify confusing others ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
commands.
Lazy may be a way of life, but that does not justify confusing others ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
index c0b5aac5f281b07aea61183c4c6a09b79447c8ea..71693650c4194514f62dd5d8524b446dd8641805 100644 (file)
-------
include::pull-fetch-param.txt[]
+-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.
+
-u, \--update-head-ok::
By default 'git-fetch' refuses to update the head which
corresponds to the current branch. This flag disables the
index 952779292b56ad70aae4d287357a8ca3db61414c..bae05dee99ebaa7866885d3d8a36cde81e5d700e 100644 (file)
-------
include::pull-fetch-param.txt[]
+-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.
Author
------
index 809ac8ba069a8a97a686d62f1bb586005836f896..f45ac5ee4910198fa351e56bb40333612787fcd2 100644 (file)
-------
include::pull-fetch-param.txt[]
+\--all::
+ Instead of naming each ref to push, specifies all refs
+ to be pushed.
+
+-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.
Author
------
index 51222b6f3fd584639b77457be4da2cd82f9f8450..e8db9d7ca5bae5b5accdc8508e20a743ff053213 100644 (file)
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.