diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:20 -0700 |
| commit | 87a684fc531f1685fefdfbe871ac590760e892df (patch) | |
| tree | d8748ae8f55ef144a39270735b71c5ff301ebde4 /sha1_file.c | |
| parent | 8697083e1d09e0e032f2bda4f2d75f692a1618ba (diff) | |
| parent | 848de9c3831f7e476ea58e3ee426aa63fb8f6870 (diff) | |
| download | git-87a684fc531f1685fefdfbe871ac590760e892df.tar.gz | |
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
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions