]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pt/pull-log-n' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:24 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:24 +0000 (12:00 -0700)
"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>

1  2 
git-pull.sh

diff --cc git-pull.sh
Simple merge