Merge branch 'kh/you-still-use-whatchanged-fix'

The "do you still use it?" message given by a command that is
deeply deprecated and allow us to suggest alternatives has been
updated.

* kh/you-still-use-whatchanged-fix:
  BreakingChanges: remove claim about whatchanged reports
  whatchanged: remove not-even-shorter clause
  whatchanged: hint about git-log(1) and aliasing
  you-still-use-that??: help the user help themselves
  t0014: test shadowing of aliases for a sample of builtins
  git: allow alias-shadowing deprecated builtins
  git: move seen-alias bookkeeping into handle_alias(...)
  git: add `deprecated` category to --list-cmds
  Makefile: don’t add whatchanged after it has been removed

diff --cc Documentation/BreakingChanges.adoc
Simple merge

diff --cc Documentation/config/alias.adoc
Simple merge

diff --cc Documentation/git.adoc
Simple merge

diff --cc Makefile
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc git.c
Simple merge

diff --cc usage.c
Simple merge