diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:36:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:36:56 -0700 |
| commit | 7223dcafddb073d41e6a2017706cbd935c11e756 (patch) | |
| tree | 221683f49c81f159b560574d5011003e1faae3d0 /Documentation/git-merge-file.txt | |
| parent | t5516-fetch-push.sh: style cleanup (diff) | |
| parent | check_aliased_update: strcpy() instead of strcat() to copy (diff) | |
| download | tgif-7223dcafddb073d41e6a2017706cbd935c11e756.tar.xz | |
Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-symref-alias
* tr/receive-pack-aliased-update-fix:
check_aliased_update: strcpy() instead of strcat() to copy
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions