Merge branch 'sb/atomic-push' into mh/ref-trans-value-check
commit507d6aa5bf2fb9f56d0c7f70d4ff3b8177da9d8e
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Feb 2015 22:37:17 +0000 (9 14:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Feb 2015 22:37:17 +0000 (9 14:37 -0800)
treeef1fc1dd06e2e394ebf75652b41ac732c2fdddfb
parent61c9475221a139245d8c56ae79be25f8ee9c35c2
parent04b39f195baf95b79c9c28a096011e9fe0a08303
Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

* 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
Documentation/config.txt
Documentation/git-push.txt
builtin/push.c
builtin/receive-pack.c
send-pack.c
transport.c