Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit896884c0091682c5995a2d2f3a7c635978fed68c
authorJakub Narebski <jnareb@gmail.com>
Mon, 27 Nov 2006 11:46:43 +0000 (27 12:46 +0100)
committerJakub Narebski <jnareb@gmail.com>
Mon, 27 Nov 2006 11:46:43 +0000 (27 12:46 +0100)
treef19bb94e043cf43fd49e03abeb699c36fef77319
parentc68bd0fe4d94c4058d87041b3d36d5532dc8b346
parent36f2587ffb6802cb38071510810f48cddfc4f34a
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  grep: do not skip unmerged entries when grepping in the working tree.
  git-tag: allow empty tag message if -m is given explicitly.