projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8697083 848de9c)
Merge branch 'ld/p4-preserve-user-names'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:20 +0000 (20:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:20 +0000 (20:37 -0700)
* 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


Trivial merge
Git—the stupid content tracker