Code

Merge branch 'pb/log-first-parent-p-m'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:25:39 +0000 (16:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:25:39 +0000 (16:25 -0700)
commit797d44343c831680aeae3392259fcadeb178bf61
tree6639bf5dfb12eea0a67bd3b3323e3cabd79bc58e
parent954f7cfdac48b8d9fe91c29ecfa44ac0c639867c
parent2bf6587349e31b582dae47954b1a334052230e28
Merge branch 'pb/log-first-parent-p-m'

* pb/log-first-parent-p-m:
  show --first-parent/-m: do not default to --cc
  show -c: show patch text
  revision: introduce setup_revision_opt
  t4013: add tests for log -p -m --first-parent
  git log -p -m: document -m and honor --first-parent
Documentation/rev-list-options.txt
builtin/diff-tree.c
builtin/log.c
revision.c