diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-14 12:37:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-14 12:37:28 -0700 |
| commit | adf59ec127f447aa83c84f9dbe2ae4e6417f3760 (patch) | |
| tree | 6f18778312b98ea48205c127c1a07e967dc4c77b /Documentation | |
| parent | 0bdf93cbf0afd568384f237378ba368e751a2f0f (diff) | |
| parent | b8960bbe7bdfc0b232462f916ee8151c83afd16f (diff) | |
| download | git-adf59ec127f447aa83c84f9dbe2ae4e6417f3760.tar.gz | |
Merge branch 'jk/renamelimit' (early part)
* 'jk/renamelimit' (early part):
diff: make "too many files" rename warning optional
bump rename limit defaults
add merge.renamelimit config option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 9719311b42..48ce747cf4 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -6,6 +6,11 @@ merge.log:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. +merge.renameLimit:: + The number of files to consider when performing rename detection + during a merge; if not specified, defaults to the value of + diff.renameLimit. + merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", |