Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  Fix bash completion in path with spaces
  bash completion: only show 'log --merge' if merging
  git-tag(1): add hint about commit messages
  Documentation: update graph api example.

Conflicts:
	contrib/completion/git-completion.bash

diff --cc Documentation/git-tag.txt
Simple merge

diff --cc contrib/completion/git-completion.bash
Simple merge