diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-15 22:28:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 22:28:39 -0700 |
| commit | 0248269de7cca134098c35330c96a84a39eca214 (patch) | |
| tree | 6a699c9f0efbe26f3f87b2a9f8b3d0e721b90f48 /git-p4.txt | |
| parent | b61a777e41bce40f57f77443aca23664309e215d (diff) | |
| download | git-htmldocs-0248269de7cca134098c35330c96a84a39eca214.tar.gz | |
Autogenerated HTML docs for v1.7.11.2-249-g31c79
Diffstat (limited to 'git-p4.txt')
| -rw-r--r-- | git-p4.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-p4.txt b/git-p4.txt index fe1f49bc6..8228f33e3 100644 --- a/git-p4.txt +++ b/git-p4.txt @@ -255,7 +255,7 @@ These options can be used to modify 'git p4 submit' behavior. p4. By default, this is the most recent p4 commit reachable from 'HEAD'. --M[<n>]:: +-M:: Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 using explicit 'move' operations. There is no corresponding option to detect copies, but there are @@ -465,13 +465,15 @@ git-p4.useClientSpec:: Submit variables ~~~~~~~~~~~~~~~~ git-p4.detectRenames:: - Detect renames. See linkgit:git-diff[1]. + Detect renames. See linkgit:git-diff[1]. This can be true, + false, or a score as expected by 'git diff -M'. git-p4.detectCopies:: - Detect copies. See linkgit:git-diff[1]. + Detect copies. See linkgit:git-diff[1]. This can be true, + false, or a score as expected by 'git diff -C'. git-p4.detectCopiesHarder:: - Detect copies harder. See linkgit:git-diff[1]. + Detect copies harder. See linkgit:git-diff[1]. A boolean. git-p4.preserveUser:: On submit, re-author changes to reflect the git author, |