Merge branch 'lb/contrib-contacts-looser-diff-parsing'

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 190a5394b9265270faadf578685e9a12b4efebfd..5f28b32dc7ff75830bde919b2f4776f7a9b017e2 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -72,6 +72,8 @@ if test -n "$OPTIONS_SPEC"; then
        parseopt_extra=
        [ -n "$OPTIONS_KEEPDASHDASH" ] &&
                parseopt_extra="--keep-dashdash"
+       [ -n "$OPTIONS_STUCKLONG" ] &&
+               parseopt_extra="$parseopt_extra --stuck-long"
 
        eval "$(
                echo "$OPTIONS_SPEC" |
@@ -159,7 +161,8 @@ git_pager() {
                GIT_PAGER=cat
        fi
        : ${LESS=-FRSX}
-       export LESS
+       : ${LV=-c}
+       export LESS LV
 
        eval "$GIT_PAGER" '"$@"'
 }