From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:24 +0000 (-0700)
Subject: Merge branch 'pt/pull-log-n' into maint
X-Git-Tag: v2.4.3~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4cb9fe35c015c576177d6a0ce096c935876544fc?ds=inline;hp=-c

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>
---

4cb9fe35c015c576177d6a0ce096c935876544fc
diff --combined git-pull.sh
index 09f6beabdc,13e9d37efa..47d89c1fc7
--- a/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)