diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:09:58 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:05 -0700 |
| commit | d9a680acf68caef16b5f316ed7917d8160d3578a (patch) | |
| tree | f2d8e508422450ed8dc8575d3191c5cc52beb08b /contrib | |
| parent | merge script: handle -m --log correctly (diff) | |
| download | tgif-d9a680acf68caef16b5f316ed7917d8160d3578a.tar.xz | |
merge script: handle many-way octopus
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/examples/git-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 91e33a3f03..410fa3c815 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -374,7 +374,7 @@ case "$#" in common=$(git merge-base --all $head "$@") ;; *) - common=$(git show-branch --merge-base $head "$@") + common=$(git merge-base --all --octopus $head "$@") ;; esac echo "$head" >"$GIT_DIR/ORIG_HEAD" @@ -528,9 +528,9 @@ if test '' != "$result_tree" then if test "$allow_fast_forward" = "t" then - parents=$(git show-branch --independent "$head" "$@") + parents=$(git merge-base --independent "$head" "$@") else - parents=$(git rev-parse "$head" "$@") + parents=$(git rev-parse "$head" "$@") fi parents=$(echo "$parents" | sed -e 's/^/-p /') result_commit=$(printf '%s\n' "$merge_msg" | git commit-tree $result_tree $parents) || exit |