diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:43:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:43:51 -0800 |
| commit | 39fa6112ec8492f9300765e1f71e7c8ecfafc713 (patch) | |
| tree | aaf52d72ae2010c4a99d0f0c3ccd1c3f40cdcb91 /Documentation/config.txt | |
| parent | 4d5c4e498a14af732f3b0b690f8b551d18610bfc (diff) | |
| parent | 04b39f195baf95b79c9c28a096011e9fe0a08303 (diff) | |
| download | git-39fa6112ec8492f9300765e1f71e7c8ecfafc713.tar.gz git-39fa6112ec8492f9300765e1f71e7c8ecfafc713.tar.xz | |
Merge branch 'sb/atomic-push'
"git push" has been taught a "--atomic" option that makes push to
update more than one ref an "all-or-none" affair.
* sb/atomic-push:
Document receive.advertiseatomic
t5543-atomic-push.sh: add basic tests for atomic pushes
push.c: add an --atomic argument
send-pack.c: add --atomic command line argument
send-pack: rename ref_update_to_be_sent to check_to_send_update
receive-pack.c: negotiate atomic push support
receive-pack.c: add execute_commands_atomic function
receive-pack.c: move transaction handling in a central place
receive-pack.c: move iterating over all commands outside execute_commands
receive-pack.c: die instead of error in case of possible future bug
receive-pack.c: shorten the execute_commands loop over all commands
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 04e2a7168..1a54eae8f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2094,6 +2094,11 @@ rebase.autostash:: successful rebase might result in non-trivial conflicts. Defaults to false. +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. + receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop |