Junio C Hamano 6e2ba77bda 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

2018-05-30 14:04:04 +09:00

165 KiB

Raw Blame History

View Raw