Merge branch 'maint-1.6.0' into maint-1.6.1
commitbc69776aa12c68958e381e8c24e8faa172dde2d8
authorJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 22:20:29 +0000 (12 15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 22:20:29 +0000 (12 15:20 -0700)
treea9775aa79f0285ea565a7ff035e1ca54dbc56447
parentf7af75777fd5a217d43acb2098cf043a73c20b01
parentc6d8f7635f619f6576dccf17c1f1264d2cc37a2a
Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  State the effect of filter-branch on graft explicitly
  process_{tree,blob}: Remove useless xstrdup calls
Documentation/git-filter-branch.txt
builtin-pack-objects.c