diff options
| author | Gary Gibbons <ggibbons@perforce.com> | 2012-07-04 13:40:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-06 06:23:28 (GMT) |
| commit | 84cb00036fb59cf0ff305dcc27551f0519b5098c (patch) | |
| tree | 7664cd1b9d9f86ba65c8079d93b4da1f6721010b /Documentation | |
| parent | a0327c0edc7ada60ae2af5ec8daa5dcfcacd095d (diff) | |
| download | git-84cb00036fb59cf0ff305dcc27551f0519b5098c.zip git-84cb00036fb59cf0ff305dcc27551f0519b5098c.tar.gz git-84cb00036fb59cf0ff305dcc27551f0519b5098c.tar.bz2 | |
git p4: refactor diffOpts calculation
P4Submit.applyCommit()
To avoid recalculating the same diffOpts for each commit, move it
out of applyCommit() and into the top-level run(). Also fix a bug
in that code which interpreted the value of detectRenames as a
string rather than as a boolean.
[pw: fix documentation, rearrange code a bit]
Signed-off-by: Gary Gibbons <ggibbons@perforce.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 fe1f49b..8228f33 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, |