From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 May 2011 03:37:20 +0000 (-0700)
Subject: Merge branch 'ld/p4-preserve-user-names'
X-Git-Tag: v1.7.6-rc0~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87a684fc531f1685fefdfbe871ac590760e892df;p=git.git

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
---

87a684fc531f1685fefdfbe871ac590760e892df