| commit | 259f4f1efe542b2768c7c94c7bd611aac7d6cc18 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:19 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:19 +0000 (4 17:50 -0700) | ||
| tree | 2cbc1d4eed4aa77ea3ae61902304617acafe4f26 | treesnapshot (tar.gz zip) |
| parent | 166443ab4beecd0f3d9936923570a842ed07902a | commitdiff |
| parent | d4785cd11dd0a55e30a1185a96910f0e57b6049a | commitdiff |
Merge branch 'js/maint-receive-pack-symref-alias' into next
* js/maint-receive-pack-symref-alias:
t5516-fetch-push.sh: style cleanup
receive-pack: detect aliased updates which can occur with symrefs
receive-pack: switch global variable 'commands' to a parameter
Conflicts:
t/t5516-fetch-push.sh
* js/maint-receive-pack-symref-alias:
t5516-fetch-push.sh: style cleanup
receive-pack: detect aliased updates which can occur with symrefs
receive-pack: switch global variable 'commands' to a parameter
Conflicts:
t/t5516-fetch-push.sh
| builtin/receive-pack.c | diff1 | diff2 | blobhistory |
| t/t5516-fetch-push.sh | diff1 | diff2 | blobhistory |