diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:38:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:38:32 -0700 |
| commit | 77f3591dbbceebfd026d087709d91cd3a9b3e8a1 (patch) | |
| tree | 228298cd395c90cdae90df41b29b37d1ac227955 /Documentation | |
| parent | 7bdb74868cf51245bce6ab033a1588e312e87310 (diff) | |
| parent | 8e9497c2e742f25dc25f85d0382833a0b79dfa8f (diff) | |
| download | git-77f3591dbbceebfd026d087709d91cd3a9b3e8a1.tar.gz | |
Merge branch 'pw/git-p4-move'
* pw/git-p4-move:
git p4: add support for 'p4 move' in P4Submit
git p4: refactor diffOpts calculation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index fe1f49bc6f..8228f33e3f 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/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, |