summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorBen Peart <Ben.Peart@microsoft.com>2018-05-02 16:01:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-08 07:19:41 (GMT)
commita7152e9d226652e6ceaa64f099fc628aa2a909bd (patch)
tree69dcb177e115ae89d2f47c8c15ea0a4dfde27f68 /Documentation/merge-strategies.txt
parent1de70dbd1ada0069d1b6cd6345323906cc9a9ed3 (diff)
downloadgit-a7152e9d226652e6ceaa64f099fc628aa2a909bd.zip
git-a7152e9d226652e6ceaa64f099fc628aa2a909bd.tar.gz
git-a7152e9d226652e6ceaa64f099fc628aa2a909bd.tar.bz2
merge: update documentation for {merge,diff}.renameLimit
Update the documentation to better indicate that the renameLimit setting is ignored if rename detection is turned off via command line options or config settings. Signed-off-by: Ben Peart <benpeart@microsoft.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions