summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-11-12 21:56:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-12 21:56:14 -0800
commit902a4a252a05c492824be693d5ed1888961756f9 (patch)
tree55e58400693daaedb37dfb929df931f6de91cfad /Documentation
parentMerge branch 'dl/xdiff' (diff)
parentreceive-pack: detect push to current branch of non-bare repo (diff)
downloadtgif-902a4a252a05c492824be693d5ed1888961756f9.tar.xz
Merge branch 'jk/deny-push-to-current'
* jk/deny-push-to-current: receive-pack: detect push to current branch of non-bare repo t5516: refactor oddball tests
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 965ed746da..32dcd643d2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1198,6 +1198,15 @@ receive.denyNonFastForwards::
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.