projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sha1_name: warning ambiguous refs.
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
2b4a603
..
cc0952a
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-13,6
+13,10
@@
LF='
all_strategies='recursive octopus resolve stupid ours'
default_strategies='recursive'
use_strategies=
all_strategies='recursive octopus resolve stupid ours'
default_strategies='recursive'
use_strategies=
+if test "@@NO_PYTHON@@"; then
+ all_strategies='resolve octopus stupid ours'
+ default_strategies='resolve'
+fi
dropsave() {
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
dropsave() {
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
@@
-127,10
+131,10
@@
case "$#,$common,$no_commit" in
;;
1,"$head",*)
# Again the most common case of merging one remote.
;;
1,"$head",*)
# Again the most common case of merging one remote.
- echo "Updating from $head to $1
.
"
+ echo "Updating from $head to $1"
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
- git-read-tree -u -m $head "$new_head" &&
+ git-read-tree -u -
v -
m $head "$new_head" &&
finish "$new_head" "Fast forward"
dropsave
exit 0
finish "$new_head" "Fast forward"
dropsave
exit 0
@@
-146,7
+150,7
@@
case "$#,$common,$no_commit" in
echo "Trying really trivial in-index merge..."
git-update-index --refresh 2>/dev/null
echo "Trying really trivial in-index merge..."
git-update-index --refresh 2>/dev/null
- if git-read-tree --trivial -m -u $common $head "$1" &&
+ if git-read-tree --trivial -m -u
-v
$common $head "$1" &&
result_tree=$(git-write-tree)
then
echo "Wonderful."
result_tree=$(git-write-tree)
then
echo "Wonderful."