Merge branch 'bk/ancestry-path'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:54 +0000 (12:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:54 +0000 (12:35 -0700)
* bk/ancestry-path:
  t6019: avoid refname collision on case-insensitive systems
  revision: do not include sibling history in --ancestry-path output
  revision: keep track of the end-user input from the command line
  rev-list: Demonstrate breakage with --ancestry-path --all

1  2 
revision.c
revision.h

diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge