summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-03 22:04:14 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-06 21:43:27 -0800
commit1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f (patch)
tree908d448f476257bbc49d9c56debfd65d43d5ac52 /git-merge-octopus.sh
parent8bc5c04a715ee0746df2bcd7e0924f4119140ad2 (diff)
downloadgit-1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f.tar.gz
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>
Diffstat (limited to 'git-merge-octopus.sh')
-rwxr-xr-xgit-merge-octopus.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index eb74f96e81..eb3f473d5a 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -90,7 +90,7 @@ do
NON_FF_MERGE=1
echo "Trying simple merge with $SHA1"
- git-read-tree -u -m $common $MRT $SHA1 || exit 2
+ git-read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
next=$(git-write-tree 2>/dev/null)
if test $? -ne 0
then