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

1  2 
Documentation/config.txt
Documentation/git-push.txt
builtin/push.c
builtin/receive-pack.c
send-pack.c
transport.c
Simple merge
Simple merge
diff --cc builtin/push.c
Simple merge
Simple merge
diff --cc send-pack.c
Simple merge
diff --cc transport.c
Simple merge