Merge branch 'tr/maint-show-walk'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Jul 2012 22:36:44 +0000 (15:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jul 2012 22:36:44 +0000 (15:36 -0700)
Fixes "git show"'s auto-walking behaviour, and make it behave just
like "git log" does when it walks.

* tr/maint-show-walk:
  show: fix "range implies walking"
  Demonstrate git-show is broken with ranges

1  2 
builtin/log.c

diff --cc builtin/log.c
Simple merge