Merge branch 'master' into next
commitfc4835d56cdcbe56ee4c95a861d5683475c51216
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 May 2008 05:40:56 +0000 (3 22:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 May 2008 05:40:56 +0000 (3 22:40 -0700)
tree36e3d0885f773edce51a8fe5f3c2c682883414b8
parentb8f920fbed687f5b65443ee32c1e8fe0674336d6
parentc697ad143ba1ff58b29e7efe149d244d4b7010a5
Merge branch 'master' into next

* master:
  Cleanup xread() loops to use read_in_full()
  checkout: don't rfc2047-encode oneline on detached HEAD
  Documentation: hooks: fix missing verb in pre-applypatch description
  filter-branch: Documentation fix.
  log: print log entry terminator even if the message is empty
  Remove dead code: show_log() sep argument and diff_options.msg_sep
  git-svn: Same default as cvsimport when using --use-log-author
Documentation/git-filter-branch.txt
builtin-log.c