Merge branch 'pt/pull-log-n' into maint

"git pull --log" and "git pull --no-log" worked as expected, but
"git pull --log=20" did not.

* pt/pull-log-n:
pull: handle --log=<n>

diff --combined git-pull.sh
index 09f6beabdcc9c069d688af1f82bac5cdbbdcdd07,13e9d37efa61610e13d21f88325a045d276ec776..47d89c1fc73b0b8245632563db83017296af7a62
--- 1/git-pull.sh
--- 2/git-pull.sh
+++ b/git-pull.sh
@@@ -54,11 -54,8 +54,11 @@@ the
  fi
  
  # Setup default fast-forward options via `pull.ff`
 -pull_ff=$(git config pull.ff)
 +pull_ff=$(bool_or_string_config pull.ff)
  case "$pull_ff" in
 +true)
 +      no_ff=--ff
 +      ;;
  false)
        no_ff=--no-ff
        ;;
@@@ -84,8 -81,8 +84,8 @@@ d
                diffstat=--no-stat ;;
        --stat|--summary)
                diffstat=--stat ;;
-       --log|--no-log)
-               log_arg=$1 ;;
+       --log|--log=*|--no-log)
+               log_arg="$1" ;;
        --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
                no_commit=--no-commit ;;
        --c|--co|--com|--comm|--commi|--commit)