diff options
| author | Luke Diamand <luke@diamand.org> | 2011-05-13 20:46:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 12:59:13 -0700 |
| commit | 848de9c3831f7e476ea58e3ee426aa63fb8f6870 (patch) | |
| tree | c6d80ef1b5068833d20a1232a5e274d1578bfd34 /contrib/fast-import/git-p4.txt | |
| parent | ecdba36da6143bc00ade66b655bcff910f3e93b3 (diff) | |
| download | git-848de9c3831f7e476ea58e3ee426aa63fb8f6870.tar.gz | |
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>
Diffstat (limited to 'contrib/fast-import/git-p4.txt')
| -rw-r--r-- | contrib/fast-import/git-p4.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt index b6986f0ebd..caa4bb3e30 100644 --- a/contrib/fast-import/git-p4.txt +++ b/contrib/fast-import/git-p4.txt @@ -225,6 +225,13 @@ stop. With allowMissingPerforceUsers set to true, git-p4 will use the current user (i.e. the behavior without --preserve-user) and carry on with the perforce commit. +git-p4.skipUserNameCheck + + git config [--global] git-p4.skipUserNameCheck false + +When submitting, git-p4 checks that the git commits are authored by the current +p4 user, and warns if they are not. This disables the check. + Implementation Details... ========================= |