diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-07 10:25:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 10:25:15 -0700 |
| commit | 56bfacef7966553530532d58c07787754add2465 (patch) | |
| tree | 3e56ab8a4fe42fee53571fb6f7d5fee7ec19252e /contrib/examples/git-merge.sh | |
| parent | fix git branch -m in presence of cross devices (diff) | |
| parent | check_aliased_update: strcpy() instead of strcat() to copy (diff) | |
| download | tgif-56bfacef7966553530532d58c07787754add2465.tar.xz | |
Merge branch 'tr/receive-pack-aliased-update-fix' into maint
* tr/receive-pack-aliased-update-fix:
check_aliased_update: strcpy() instead of strcat() to copy
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 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions