projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trivial usage string clean-up
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
d352a3c
..
e50fbb1
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-3,15
+3,13
@@
# Copyright (c) 2005 Junio C Hamano
#
# Copyright (c) 2005 Junio C Hamano
#
+
+USAGE='[-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+'
. git-sh-setup
LF='
'
. git-sh-setup
LF='
'
-usage () {
- die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
-}
-
all_strategies='recursive octopus resolve stupid ours'
default_strategies='recursive'
use_strategies=
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
shift
# All the rest are remote heads
+remoteheads=
for remote
do
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"
die "$remote - not something we can merge"
+ remoteheads="${remoteheads}$remotehead "
done
done
+set x $remoteheads ; shift
case "$#" in
1)
case "$#" in
1)
@@
-273,7
+274,8
@@
fi
case "$best_strategy" in
'')
restorestate
case "$best_strategy" in
'')
restorestate
- die "No merge strategy handled the merge."
+ echo >&2 "No merge strategy handled the merge."
+ exit 2
;;
"$wt_strategy")
# We already have its result in the working tree.
;;
"$wt_strategy")
# We already have its result in the working tree.