Merge branch 'master' into next

* master:
  Optionally do not list empty directories in git-ls-files --others
  Document git-rebase behavior on conflicts.
  Fix error handling for nonexistent names

diff --cc Documentation/git-ls-files.txt
Simple merge

diff --cc ls-files.c
Simple merge