![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 4 Feb 2006 06:04:14 +0000 (22:04 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Feb 2006 05:43:27 +0000 (21:43 -0800) | ||
| commit | 1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f | |
| tree | 908d448f476257bbc49d9c56debfd65d43d5ac52 | tree | snapshot |
| parent | 8bc5c04a715ee0746df2bcd7e0924f4119140ad2 | commit | diff |
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>
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>
| git-merge-octopus.sh | diff | blob | history | |
| git-merge-resolve.sh | diff | blob | history | |
| read-tree.c | diff | blob | history |