![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:20 +0000 (20:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:20 +0000 (20:37 -0700) | ||
| commit | 87a684fc531f1685fefdfbe871ac590760e892df | |
| tree | d8748ae8f55ef144a39270735b71c5ff301ebde4 | tree | snapshot |
| parent | 8697083e1d09e0e032f2bda4f2d75f692a1618ba | commit | diff |
| parent | 848de9c3831f7e476ea58e3ee426aa63fb8f6870 | commit | diff |
Merge branch 'ld/p4-preserve-user-names'
* ld/p4-preserve-user-names:
git-p4: warn if git authorship won't be retained
git-p4: small improvements to user-preservation
git-p4: add option to preserve user names
* ld/p4-preserve-user-names:
git-p4: warn if git authorship won't be retained
git-p4: small improvements to user-preservation
git-p4: add option to preserve user names