| commit | 2dcf64469ccef28bcc452a0119bb40ccf376e7e8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 21:09:03 +0000 (25 14:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 21:09:04 +0000 (25 14:09 -0700) | ||
| tree | 3238402783ec81141f354023bdf10a4be8c1ea19 | treesnapshot (tar.gz zip) |
| parent | a7bd6f0df8ca623c8071b932faf6b2095d5ad609 | commitdiff |
| parent | 729bbcea374f7171a4dafd995992d3c1aa525cda | commitdiff |
Merge branch 'tr/merge-recursive-index-only' into pu
* tr/merge-recursive-index-only:
merge-recursive: -Xindex-only to leave worktree unchanged
merge-recursive: internal flag to avoid touching the worktree
merge-recursive: remove dead conditional in update_stages()
* tr/merge-recursive-index-only:
merge-recursive: -Xindex-only to leave worktree unchanged
merge-recursive: internal flag to avoid touching the worktree
merge-recursive: remove dead conditional in update_stages()
| Documentation/merge-strategies.txt | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |
| t/t3030-merge-recursive.sh | diff1 | diff2 | blobhistory |