X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=32dcd643d2e9ea82a7b65e295e9aa55f7dd999c2;hb=a5b2d4ac24ef18cf8c628e258bef8a20d9bf4b2b;hp=29369d051b1d8248b85ae177151a4ebaa79bce3b;hpb=35d2f73b999636c93049b2d7bed1458bcf2f9648;p=git.git

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 29369d051..32dcd643d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1188,12 +1188,25 @@ receive.unpackLimit::
 	especially on slow filesystems.  If not set, the value of
 	`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.
+
 receive.denyNonFastForwards::
 	If set to true, git-receive-pack will deny a ref update which is
 	not a fast forward. Use this to prevent such an update via a push,
 	even if that push is forced. This configuration variable is
 	set when initializing a shared repository.
 
+receive.denyCurrentBranch::
+	If set to true or "refuse", receive-pack will deny a ref 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",
+	print a warning of such a push to stderr, but allow the push to
+	proceed. If set to false or "ignore", allow such pushes with no
+	message. Defaults to "warn".
+
 transfer.unpackLimit::
 	When `fetch.unpackLimit` or `receive.unpackLimit` are
 	not set, the value of this variable is used instead.