diff options
| author |  Justin Frankel <justin@cockos.com> | 2010-08-26 00:50:45 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-26 09:20:03 -0700 |
| commit | 58a1ece478c6038a7eb0b6e494d563bd5e6d5978 (patch) | |
| tree | ea845e2862c6e9a713455c6108a85677b9d4e0ed /Documentation/gitk.txt | |
| parent | ll-merge: replace flag argument with options struct (diff) | |
| download | tgif-58a1ece478c6038a7eb0b6e494d563bd5e6d5978.tar.xz | |
merge-recursive --patience
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: Justin Frankel <justin@cockos.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitk.txt')
0 files changed, 0 insertions, 0 deletions