Merge branch 'jc/rev-list-ancestry-path' into next
commitb35488a91c2e98b0119747962db798901b01e9a0
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2010 15:27:58 +0000 (17 08:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2010 15:27:58 +0000 (17 08:27 -0700)
tree884d86bd17baed5e698ac9cdec2bda38cb226417
parent66b0c9f89f75d261f350ff13dde17efbc01ccbb3
parentcb7529e13bce186f8b883c9fbb08602cd3a0795f
Merge branch 'jc/rev-list-ancestry-path' into next

* jc/rev-list-ancestry-path:
  revision: Turn off history simplification in --ancestry-path mode
  revision: Fix typo in --ancestry-path error message
  Documentation/rev-list-options.txt: Explain --ancestry-path
  Documentation/rev-list-options.txt: Fix missing line in example history graph
  revision: --ancestry-path
revision.c