Merge branch 'jc/maint-log-first-parent-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:54 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:54 +0000 (13:18 -0800)
* jc/maint-log-first-parent-pathspec:
  Making pathspec limited log play nicer with --first-parent

1  2 
revision.c

diff --cc revision.c
Simple merge