Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit19144aa8f8ce964929cce54682e38c6e80a4dca9
authorJakub Narebski <jnareb@gmail.com>
Wed, 19 Dec 2007 08:37:03 +0000 (19 09:37 +0100)
committerJakub Narebski <jnareb@gmail.com>
Wed, 19 Dec 2007 08:37:03 +0000 (19 09:37 +0100)
tree613615d2fe17f9695610f4e0328410d1391b23b3
parentb0ccd1d491576f18d5e7c2b14708ebc8f328e717
parentce85b053d827e2f7c2ee2683cc09393e4768cc22
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  fix style of a few comments in diff-delta.c
  git-filter-branch.sh: more portable tr usage: use \012, not \n.
  filter-branch: Remove broken and unnecessary summary of rewritten refs.
  Fix some documentation typos.
  builtin-blame.c: remove unneeded memclr()
  unpack-trees: FLEX_ARRAY fix