diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-10-19 21:25:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-19 21:25:39 -0700 |
| commit | d6a73596e766b934e25182e7cdd8e6c2dbcc671e (patch) | |
| tree | 3567e782e882798d9593686b4bbf13670b88e464 /Documentation | |
| parent | Do not feed rev-list an invalid SHA1 expression. (diff) | |
| download | tgif-d6a73596e766b934e25182e7cdd8e6c2dbcc671e.tar.xz | |
git-fetch/push/pull: documentation.
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fetch.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-push.txt | 9 | ||||
| -rw-r--r-- | Documentation/pull-fetch-param.txt | 10 |
4 files changed, 18 insertions, 10 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index c0b5aac5f2..71693650c4 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -25,6 +25,11 @@ OPTIONS ------- 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 diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 952779292b..bae05dee99 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -24,6 +24,10 @@ OPTIONS ------- 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 ------ diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 809ac8ba06..f45ac5ee49 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -21,6 +21,15 @@ OPTIONS ------- 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 ------ diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 51222b6f3f..e8db9d7ca5 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -75,13 +75,3 @@ Some short-cut notations are also supported. 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. |