| commit | 848de9c3831f7e476ea58e3ee426aa63fb8f6870 | |
| author | Luke Diamand <luke@diamand.org> | |
| Fri, 13 May 2011 19:46:00 +0000 (13 20:46 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 19:59:13 +0000 (13 12:59 -0700) | ||
| tree | c6d80ef1b5068833d20a1232a5e274d1578bfd34 | treesnapshot (tar.gz zip) |
| parent | ecdba36da6143bc00ade66b655bcff910f3e93b3 | commitdiff |
git-p4: warn if git authorship won't be retained
If the git commits you are submitting contain changes made by
other people, the authorship will not be retained. Change git-p4
to warn of this and to note that --preserve-user can be used
to solve the problem (if you have suitable permissions).
The warning can be disabled.
Add a test case and update documentation.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If the git commits you are submitting contain changes made by
other people, the authorship will not be retained. Change git-p4
to warn of this and to note that --preserve-user can be used
to solve the problem (if you have suitable permissions).
The warning can be disabled.
Add a test case and update documentation.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/fast-import/git-p4 | diffblobblamehistory | |
| contrib/fast-import/git-p4.txt | diffblobblamehistory | |
| t/t9800-git-p4.sh | diffblobblamehistory |