From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Feb 2006 06:04:14 +0000 (-0800)
Subject: read-tree --aggressive
X-Git-Tag: v1.2.0~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f?hp=1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f

read-tree --aggressive

A new flag --aggressive resolves what we traditionally resolved
with external git-merge-one-file inside index while read-tree
3-way merge works.

git-merge-octopus and git-merge-resolve use this flag before
running git-merge-index with git-merge-one-file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---