| commit | 729bbcea374f7171a4dafd995992d3c1aa525cda | |
| author | Thomas Rast <trast@inf.ethz.ch> | |
| Sat, 26 Oct 2013 14:43:18 +0000 (26 16:43 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Feb 2014 18:35:20 +0000 (5 10:35 -0800) | ||
| tree | 33e76b698c9730dd342b2d029988a64c9145a729 | treesnapshot (tar.gz zip) |
| parent | 5ac920e96bb6145532f094cbf765a87d2dbe1251 | commitdiff |
merge-recursive: -Xindex-only to leave worktree unchanged
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-strategies.txt | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| t/t3030-merge-recursive.sh | diffblobblamehistory |