mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge script: handle many-way octopus

Browse Source 
Based on v1.6.0-rc0~51^2~5 (Build in merge, 2008-07-07).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
2010-08-17 02:09:58 -05:00
committed by Junio C Hamano
parent eeb70b6769
commit d9a680acf6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/examples/git-merge.sh
View File

@ -374,7 +374,7 @@ case "$#" in
common=$(git merge-base --all $head "$@") common=$(git merge-base --all $head "$@")
;; ;;
*) *)
common=$(git show-branch --merge-base $head "$@") common=$(git merge-base --all --octopus $head "$@")
;; ;;
esac esac
echo "$head" >"$GIT_DIR/ORIG_HEAD" echo "$head" >"$GIT_DIR/ORIG_HEAD"
@ -528,7 +528,7 @@ if test '' != "$result_tree"
then then
if test "$allow_fast_forward" = "t" if test "$allow_fast_forward" = "t"
then then
parents=$(git show-branch --independent "$head" "$@") parents=$(git merge-base --independent "$head" "$@")
else else
parents=$(git rev-parse "$head" "$@") parents=$(git rev-parse "$head" "$@")
fi fi