X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=e50fbb1160ad6ccfebc0d65fcc54bc3488e597cd;hb=806f36d4d7caf75b6d3e098cb0353d85d3477c7d;hp=a221daa7f4882892b29b19b156dfc31986fc8912;hpb=5e80092f7e6db09a40a62e837ca3f74f0bc5ad73;p=git.git diff --git a/git-merge.sh b/git-merge.sh index a221daa7..e50fbb11 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -3,15 +3,13 @@ # Copyright (c) 2005 Junio C Hamano # + +USAGE='[-n] [--no-commit] [-s ]... +' . git-sh-setup LF=' ' -usage () { - die "git-merge [-n] [--no-commit] [-s ]... +" -} - all_strategies='recursive octopus resolve stupid ours' default_strategies='recursive' use_strategies= @@ -97,11 +95,14 @@ head=$(git-rev-parse --verify "$1"^0) || usage shift # All the rest are remote heads +remoteheads= for remote do - git-rev-parse --verify "$remote"^0 >/dev/null || + remotehead=$(git-rev-parse --verify "$remote"^0) || die "$remote - not something we can merge" + remoteheads="${remoteheads}$remotehead " done +set x $remoteheads ; shift case "$#" in 1)