Merge branch 'bk/ancestry-path' into jc/branch-desc
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Sep 2011 03:13:08 +0000 (20:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Sep 2011 03:13:13 +0000 (20:13 -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