Merge branch 'jc/maint-pathspec-stdin-and-cmdline'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:18 +0000 (20:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:18 +0000 (20:37 -0700)
commite2e4aed5defb2df8dbd523613ff4ef46050abb07
tree8244d31b8cfbf8258e728677f5082273e9676afd
parent7b11753402e17be4a3fae47a0aaf616b93cd5028
parent8f2d4b1934f398c625019e5e696efcc3d6a875ce
Merge branch 'jc/maint-pathspec-stdin-and-cmdline'

* jc/maint-pathspec-stdin-and-cmdline:
  setup_revisions(): take pathspec from command line and --stdin correctly

Conflicts:
revision.c
revision.c