diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-31 20:10:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-31 14:04:06 -0700 |
| commit | ae6a470334d7d0e086e289f0c7e492e3366b66aa (patch) | |
| tree | add6eb6f7749b76dd8d5056f7ef49ebb92aab79d /Documentation/fetch-options.txt | |
| parent | fe802bd21e81cceedff2db79cc3c9a5ad75b4f93 (diff) | |
| download | git-ae6a470334d7d0e086e289f0c7e492e3366b66aa.tar.gz | |
fetch: document local ref updates with/without --force
Refer to the new git-push(1) documentation about when ref updates are
and aren't allowed with and without --force, noting how "git-fetch"
differs from the behavior of "git-push".
Perhaps it would be better to split this all out into a new
gitrefspecs(7) man page, or present this information using tables.
In lieu of that, this is accurate, and fixes a big omission in the
existing refspec docs.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/fetch-options.txt')
| -rw-r--r-- | Documentation/fetch-options.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 97d3217df9..5b624caf58 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -49,11 +49,16 @@ endif::git-pull[] -f:: --force:: - When 'git fetch' is used with `<rbranch>:<lbranch>` - refspec, it refuses to update the local branch - `<lbranch>` unless the remote branch `<rbranch>` it - fetches is a descendant of `<lbranch>`. This option - overrides that check. + When 'git fetch' is used with `<src>:<dst>` refspec it may + refuse to update the local branch as discussed +ifdef::git-pull[] + in the `<refspec>` part of the linkgit:git-fetch[1] + documentation. +endif::git-pull[] +ifndef::git-pull[] + in the `<refspec>` part below. +endif::git-pull[] + This option overrides that check. -k:: --keep:: |