From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 May 2006 00:21:35 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8a24f2fae0a08d5832318b62cb279fd02f1bdf5a;p=git.git

Merge branch 'master' into next

* master:
  Remove old "git-grep.sh" remnants
  merge-base: Clarify the comments on post processing.
  Update the documentation for git-merge-base
---

8a24f2fae0a08d5832318b62cb279fd02f1bdf5a