Merge branch 'tr/maint-show-walk' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jul 2012 20:01:40 +0000 (13:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jul 2012 20:01:40 +0000 (13:01 -0700)
"git show"'s auto-walking behaviour was an unreliable and
unpredictable hack; it now behaves 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