diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 21:30:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 21:30:31 (GMT) |
| commit | d065f687452a666c74f353306bb14debe48e40d3 (patch) | |
| tree | 275b59fe9f16903a0c7b1ebbecd74aeb7778afa7 /Documentation | |
| parent | fd1727f5fa1ca1817eee36f99c9245dc2217ecac (diff) | |
| parent | 60df071c6cce6ee3f92f62042da11c62fe113817 (diff) | |
| download | git-d065f687452a666c74f353306bb14debe48e40d3.zip git-d065f687452a666c74f353306bb14debe48e40d3.tar.gz git-d065f687452a666c74f353306bb14debe48e40d3.tar.bz2 | |
Merge branch 'ld/git-p4-expanded-keywords'
* ld/git-p4-expanded-keywords:
: Teach git-p4 to unexpand $RCS$-like keywords that are embedded in
: tracked contents in order to reduce unnecessary merge conflicts.
git-p4: add initial support for RCS keywords
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 8b92cc0..3fecefa 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/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 ---------------------- |