config: read system-wide defaults from /etc/gitconfig

diff --git a/git-merge.sh b/git-merge.sh
index 656869101a86c7a593a489408818725ec85c15fa..04a5eb0f297a691fa0520d1729ea20bd66a53bd9 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -233,7 +233,7 @@ case "$use_strategies" in
 '')
        case "$#" in
        1)
-               var="`git-repo-config --get pull.twohead`"
+               var="`git-config --get pull.twohead`"
                if test -n "$var"
                then
                        use_strategies="$var"
@@ -241,7 +241,7 @@ case "$use_strategies" in
                        use_strategies="$default_twohead_strategies"
                fi ;;
        *)
-               var="`git-repo-config --get pull.octopus`"
+               var="`git-config --get pull.octopus`"
                if test -n "$var"
                then
                        use_strategies="$var"