diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 14:45:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 14:45:50 -0800 |
| commit | e0238c23e1e315e119307c52ea25d665422b0082 (patch) | |
| tree | a512e28c84eb8adf7bba202e312b24d0c3d21622 /git-p4.txt | |
| parent | 83002c9d9c8fcf2f6a4e643e324b14b88108e739 (diff) | |
| download | git-htmldocs-e0238c23e1e315e119307c52ea25d665422b0082.tar.gz | |
Autogenerated HTML docs for v1.7.9.2-262-gba998
Diffstat (limited to 'git-p4.txt')
| -rw-r--r-- | git-p4.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-p4.txt b/git-p4.txt index 8b92cc0f8..3fecefaea 100644 --- a/git-p4.txt +++ b/git-p4.txt @@ -483,6 +483,11 @@ git-p4.skipUserNameCheck:: user map, 'git p4' exits. This option can be used to force submission regardless. +git-p4.attemptRCSCleanup: + If enabled, 'git p4 submit' will attempt to cleanup RCS keywords + ($Header$, etc). These would otherwise cause merge conflicts and prevent + the submit going ahead. This option should be considered experimental at + present. IMPLEMENTATION DETAILS ---------------------- |