diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-03 15:10:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-03 15:10:24 -0700 |
| commit | cf27c7996e986395a05c0056684923195295fd14 (patch) | |
| tree | 91c7d576445ca71e9eba9d11bfaddd353a326ab5 /Documentation/config.txt | |
| parent | 4067a45438282fe967779fcbc5c3513d2cbb5913 (diff) | |
| parent | 3ac870300a7bb430341388a8f2ec465328986617 (diff) | |
| download | git-cf27c7996e986395a05c0056684923195295fd14.tar.gz | |
Merge branch 'sb/push-options'
"git push" learned to accept and pass extra options to the
receiving end so that hooks can read and react to them.
* sb/push-options:
add a test for push options
push: accept push options
receive-pack: implement advertising and receiving push options
push options: {pre,post}-receive hook learns about push options
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8b1aee4b3b..4ae564b487 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2427,8 +2427,13 @@ rebase.instructionFormat receive.advertiseAtomic:: By default, git-receive-pack will advertise the atomic push - capability to its clients. If you don't want to this capability - to be advertised, set this variable to false. + capability to its clients. If you don't want to advertise this + capability, set this variable to false. + +receive.advertisePushOptions:: + By default, git-receive-pack will advertise the push options + capability to its clients. If you don't want to advertise this + capability, set this variable to false. receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after |