diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:19 -0700 |
| commit | 9215f76fb6d938ae93889f46f27cff22723fe0e4 (patch) | |
| tree | d73aed730de1af3e83ce367a1bf9f1a266083032 /xdiff/xdiffi.c | |
| parent | Merge branch 'sp/maint-dumb-http-pack-reidx' (diff) | |
| parent | t5516-fetch-push.sh: style cleanup (diff) | |
| download | tgif-9215f76fb6d938ae93889f46f27cff22723fe0e4.tar.xz | |
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
Diffstat (limited to 'xdiff/xdiffi.c')
0 files changed, 0 insertions, 0 deletions