aboutsummaryrefslogtreecommitdiff
path: root/rsh.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-09-25 08:36:38 +0200
committerJunio C Hamano <gitster@pobox.com>2007-10-30 17:27:40 -0700
commit07b45f8c1754a13bca67f70b600bf51ba33cf98d (patch)
treed7e5a35444596a83b0bafc3db87a6724402f872d /rsh.c
parent04bd8e5fea48a00816b461b0fb934627cfd2c45f (diff)
downloadgit-07b45f8c1754a13bca67f70b600bf51ba33cf98d.tar.gz
git-07b45f8c1754a13bca67f70b600bf51ba33cf98d.tar.xz
Make merge-recursive honor diff.renamelimit
It might be a sign of source code management gone bad, but when two branches has diverged almost beyond recognition and time has come for the branches to merge, the user is going to need all the help his tool can give him. Honoring diff.renamelimit has great potential as a painkiller in such situations. The painkiller effect could have been achieved by e.g. 'merge.renamelimit', but the flexibility gained by a separate option is questionable: our user would probably expect git to detect renames equally good when merging as when diffing (I known I did). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rsh.c')
0 files changed, 0 insertions, 0 deletions