Merge branch 'sb/clean'

* sb/clean:
  Teach git clean to use setup_standard_excludes()
  git-clean: Fix error message if clean.requireForce is not set.
  Make git-clean a builtin

diff --cc Makefile
Simple merge

diff --cc builtin.h
Simple merge

diff --cc git.c
Simple merge