diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-19 09:39:56 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-19 09:39:56 +0400 |
| commit | 636e87d705c2d6cc53d58eac31b689779d00b292 (patch) | |
| tree | a3de44b428a21e7bbcae6099a903e77fc9c9db16 /Documentation/config.txt | |
| parent | 1c9eecff97beab2d425397dc624281dff5c0be5c (diff) | |
| parent | d07ef715757ab1c2436c59adca92484fa46b2b41 (diff) | |
Merge branch 'maint'
* maint:
Documentation/gitdiffcore: fix order in pickaxe description
Documentation: fix minor inconsistency
Documentation: rebase -i ignores options passed to "git am"
hash_object: correction for zero length file
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index e5aa2cacfa..39140bad4d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1525,7 +1525,7 @@ receive.denyDeletes:: the ref. Use this to prevent such a ref deletion via a push. receive.denyCurrentBranch:: - If set to true or "refuse", receive-pack will deny a ref update + If set to true or "refuse", git-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", |