• Justin Frankel's avatar
    merge-recursive --patience · 58a1ece4
    Justin Frankel authored
    Teach the merge-recursive strategy a --patience option to use the
    "patience diff" algorithm, which tends to improve results when
    cherry-picking a patch that reorders functions at the same time as
    refactoring them.
    
    To support this, struct merge_options and ll_merge_options gain an
    xdl_opts member, so programs can use arbitrary xdiff flags (think
    "XDF_IGNORE_WHITESPACE") in a git-aware merge.
    
    git merge and git rebase can be passed the -Xpatience option to
    use this.
    
    [jn: split from --ignore-space patch; with documentation]
    Signed-off-by: default avatarJustin Frankel <justin@cockos.com>
    Signed-off-by: default avatarJonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    58a1ece4
ll-merge.h 567 Bytes