Merge branch 'ah/grammofix'

* ah/grammofix:
  grammofix in user-facing messages

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/notes.c
Simple merge

diff --cc git-stash.sh
Simple merge

diff --cc git.c
Simple merge