author | Junio C Hamano <gitster@pobox.com> | |
Fri, 21 May 2010 11:02:19 +0000 (04:02 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 21 May 2010 11:02:19 +0000 (04:02 -0700) | ||
commit | 9215f76fb6d938ae93889f46f27cff22723fe0e4 | |
tree | d73aed730de1af3e83ce367a1bf9f1a266083032 | tree | snapshot |
parent | 035bf8d7c484b82e3e278af8c91584ae724cb5d4 | commit | diff |
parent | d4785cd11dd0a55e30a1185a96910f0e57b6049a | commit | diff |
Merge branch 'js/maint-receive-pack-symref-alias'
* 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 | | | | blob | history |
t/t5516-fetch-push.sh | diff1 | | diff2 | | blob | history |