Merge branch 'maint'

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 8759c5a7e0f8748108d6eff005cde1e0893f3592..351676f6d4a39c1ac682296781f4f5c8d1a3053d 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -16,10 +16,10 @@ test -z "$(git ls-files -u)" ||
 LF='
 '
 
-all_strategies='recur recursive octopus resolve stupid ours'
+all_strategies='recur recursive octopus resolve stupid ours subtree'
 default_twohead_strategies='recursive'
 default_octopus_strategies='octopus'
-no_trivial_merge_strategies='ours'
+no_trivial_merge_strategies='ours subtree'
 use_strategies=
 
 index_merge=t
@@ -90,7 +90,8 @@ finish () {
        ?*)
                case "$no_summary" in
                '')
-                       git-diff-tree --stat --summary -M "$head" "$1"
+                       # We want color (if set), but no pager
+                       GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
                        ;;
                esac
                ;;
@@ -108,6 +109,10 @@ merge_name () {
                git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null
        then
                echo "$rh               branch '$truname' (early part) of ."
+       elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
+       then
+               sed -e 's/      not-for-merge   /               /' -e 1q \
+                       "$GIT_DIR/FETCH_HEAD"
        else
                echo "$rh               commit '$remote'"
        fi