pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/git-web--browse.sh b/git-web--browse.sh
index 7ed0faddcd75e024ce18d8b80994d41a9207a7ca..a578c3a73203fbf1bf4abfb024b1e83c45f2b2ce 100755 (executable)
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -111,7 +111,8 @@ if test -z "$browser" ; then
        browser_candidates="w3m links lynx"
     fi
     # SECURITYSESSIONID indicates an OS X GUI login session
-    if test -n "$SECURITYSESSIONID"; then
+    if test -n "$SECURITYSESSIONID" \
+           -o "$TERM_PROGRAM" = "Apple_Terminal" ; then
        browser_candidates="open $browser_candidates"
     fi
     # /bin/start indicates MinGW
@@ -161,9 +162,12 @@ case "$browser" in
                ;;
        esac
        ;;
-    w3m|links|lynx|open|start)
+    w3m|links|lynx|open)
        eval "$browser_path" "$@"
        ;;
+    start)
+        exec "$browser_path" '"web-browse"' "$@"
+        ;;
     dillo)
        "$browser_path" "$@" &
        ;;