diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:04 +0900 |
| commit | 6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e (patch) | |
| tree | 11ca48aef79f68e740aa7a97c4956327d58114cb /pager.c | |
| parent | Merge branch 'js/sequencer-and-root-commits' (diff) | |
| parent | merge: pass aggressive when rename detection is turned off (diff) | |
| download | tgif-6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e.tar.xz | |
Merge branch 'bp/merge-rename-config'
With merge.renames configuration set to false, the recursive merge
strategy can be told not to spend cycles trying to find renamed
paths and merge them accordingly.
* bp/merge-rename-config:
merge: pass aggressive when rename detection is turned off
merge: add merge.renames config setting
merge: update documentation for {merge,diff}.renameLimit
Diffstat (limited to 'pager.c')
0 files changed, 0 insertions, 0 deletions