diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-19 21:48:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 21:48:54 (GMT) |
| commit | 824a0be6be8d6c3323003bae65b3df98387e575b (patch) | |
| tree | 3a30a0d7f94026303a2a9a6d532b0c53ffa86cf0 /Documentation | |
| parent | 138014c3cf56c15fbc28915806125d8e27a610c7 (diff) | |
| parent | 2bc31d1631229d863376d48ef84eb846fea1df02 (diff) | |
| download | git-824a0be6be8d6c3323003bae65b3df98387e575b.zip git-824a0be6be8d6c3323003bae65b3df98387e575b.tar.gz git-824a0be6be8d6c3323003bae65b3df98387e575b.tar.bz2 | |
Merge branch 'jk/negative-hiderefs'
A negative !ref entry in multi-value transfer.hideRefs
configuration can be used to say "don't hide this one".
* jk/negative-hiderefs:
refs: support negative transfer.hideRefs
docs/config.txt: reorder hideRefs config
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 016f6e9..75ec02e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2313,13 +2313,10 @@ receive.denyNonFastForwards:: set when initializing a shared repository. receive.hideRefs:: - String(s) `receive-pack` uses to decide which refs to omit - from its initial advertisement. Use more than one - definitions to specify multiple prefix strings. A ref that - are under the hierarchies listed on the value of this - variable is excluded, and is hidden when responding to `git - push`, and an attempt to update or delete a hidden ref by - `git push` is rejected. + This variable is the same as `transfer.hideRefs`, but applies + only to `receive-pack` (and so affects pushes, but not fetches). + An attempt to update or delete a hidden ref by `git push` is + rejected. receive.updateServerInfo:: If set to true, git-receive-pack will run git-update-server-info @@ -2607,9 +2604,18 @@ transfer.fsckObjects:: Defaults to false. transfer.hideRefs:: - This variable can be used to set both `receive.hideRefs` - and `uploadpack.hideRefs` at the same time to the same - values. See entries for these other variables. + String(s) `receive-pack` and `upload-pack` use to decide which + refs to omit from their initial advertisements. Use more than + one definition to specify multiple prefix strings. A ref that is + under the hierarchies listed in the value of this variable is + excluded, and is hidden when responding to `git push` or `git + fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for + program-specific versions of this config. ++ +You may also include a `!` in front of the ref name to negate the entry, +explicitly exposing it, even if an earlier entry marked it as hidden. +If you have multiple hideRefs values, later entries override earlier ones +(and entries in more-specific config files override less-specific ones). transfer.unpackLimit:: When `fetch.unpackLimit` or `receive.unpackLimit` are @@ -2624,13 +2630,10 @@ uploadarchive.allowUnreachable:: `false`. uploadpack.hideRefs:: - String(s) `upload-pack` uses to decide which refs to omit - from its initial advertisement. Use more than one - definitions to specify multiple prefix strings. A ref that - are under the hierarchies listed on the value of this - variable is excluded, and is hidden from `git ls-remote`, - `git fetch`, etc. An attempt to fetch a hidden ref by `git - fetch` will fail. See also `uploadpack.allowTipSHA1InWant`. + This variable is the same as `transfer.hideRefs`, but applies + only to `upload-pack` (and so affects only fetches, not pushes). + An attempt to fetch a hidden ref by `git fetch` will fail. See + also `uploadpack.allowTipSHA1InWant`. uploadpack.allowTipSHA1InWant:: When `uploadpack.hideRefs` is in effect, allow `upload-pack` |