Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 00:21:35 +0000 (17:21 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 00:21:35 +0000 (17:21 -0700)
* master:
  Remove old "git-grep.sh" remnants
  merge-base: Clarify the comments on post processing.
  Update the documentation for git-merge-base

1  2 
Makefile

diff --cc Makefile
Simple merge