git.verplant.org Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Wed, 17 May 2006 00:21:35 +0000 (17:21 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 17 May 2006 00:21:35 +0000 (17:21 -0700)
commit	8a24f2fae0a08d5832318b62cb279fd02f1bdf5a
tree	07a0d71cb9cc6356e633dbaac96a318624b2f500	tree \| snapshot
parent	00dd7422db1e3e0c60d41c2a2299709f90bcf3f6	commit \| diff
parent	63dffdf03da65ddf1a02c3215ad15ba109189d42	commit \| diff

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