diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:54:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:54:04 -0700 |
| commit | 329351feeb0c08c835ac4ff05f127fbfe42a78cf (patch) | |
| tree | 9c6d18cb13544077b05783defd525c7440d7bc68 /Documentation/diff-options.txt | |
| parent | 9b1054d93e7e8564d0d9865cb7118cb6e756c74b (diff) | |
| parent | 37ab5156ae31ec81e3489406f23be6936a2a370c (diff) | |
| download | git-329351feeb0c08c835ac4ff05f127fbfe42a78cf.tar.gz | |
Merge branch 'kb/merge-recursive-rename-threshold'
* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold
Conflicts:
Documentation/diff-options.txt
Documentation/merge-strategies.txt
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index e954af0ad6..bfd0b571e2 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -207,6 +207,7 @@ endif::git-format-patch[] digits can be specified with `--abbrev=<n>`. -B[<n>][/<m>]:: +--break-rewrites[=[<n>][/<m>]]:: Break complete rewrite changes into pairs of delete and create. This serves two purposes: + @@ -229,6 +230,7 @@ eligible for being picked up as a possible source of a rename to another file. -M[<n>]:: +--detect-renames[=<n>]:: ifndef::git-log[] Detect renames. endif::git-log[] @@ -244,6 +246,7 @@ endif::git-log[] hasn't changed. -C[<n>]:: +--detect-copies[=<n>]:: Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`. |