Merge branch 'vb/sendemail' into next
commitf63237a18e951b93ac46a0e594f286255e1eaaaf
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 07:01:52 +0000 (4 00:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 07:01:52 +0000 (4 00:01 -0700)
treea131e9466bc5ca7ca42e31e71274ce3152dc8615
parentb9d301bca767c9c26b8514fb326dd237cb269fbb
parente96fd30553bb57a76ad38f703a3fea5b53c45ff9
Merge branch 'vb/sendemail' into next

* vb/sendemail:
  Cleanup git-send-email.perl:extract_valid_email
  read-tree --reset: update working tree file for conflicted paths.
  Documentation: Spelling fixes
  Builtin git-rev-parse.
  fetch: do not report "same" unless -verbose.
Documentation/git-read-tree.txt
builtin-read-tree.c