From: Junio C Hamano Date: Mon, 12 Dec 2011 17:16:44 GMT Subject: Re: [PATCH] tag deletions not rejected with receive.denyDeletes= true Message-ID: <7v62hl677n.fsf@alter.siamese.dyndns.org> In-Reply-To: <12967682.2821323698766430.JavaMail.root@promailix.prometil.com> Jerome DE VIVIE writes: > Junio C Hamano writes : >> Our documentation can also use some updates, as it dates to the days back >> when we more liberally used "refs" and "branches" interchangeably. > > Ok, I have turned the patch below for documentation. Err,.. what I meant by "documentation update" is more like this. Documentation/config.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 8a7d2d4..8eda8e4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1653,15 +1653,15 @@ receive.unpackLimit:: `transfer.unpackLimit` is used instead. receive.denyDeletes:: - If set to true, git-receive-pack will deny a ref update that deletes - the ref. Use this to prevent such a ref deletion via a push. + If set to true, git-receive-pack will deny an update that deletes + the branch. Use this to prevent a push from deleting a branch. receive.denyDeleteCurrent:: - If set to true, git-receive-pack will deny a ref update that + If set to true, git-receive-pack will deny an update that deletes the currently checked out branch of a non-bare repository. receive.denyCurrentBranch:: - If set to true or "refuse", git-receive-pack will deny a ref update + If set to true or "refuse", git-receive-pack will deny an update to the currently checked out branch of a non-bare repository. Such a push is potentially dangerous because it brings the HEAD out of sync with the index and working tree. If set to "warn",