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

diff --cc Documentation/git-filter-branch.txt
Simple merge

diff --cc builtin-pack-objects.c
Simple merge