Merge branch 'ah/grammofix'
commit296b4c4bbf63c8addb1654a05950843e9984d0eb
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:35 +0000 (19 11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:35 +0000 (19 11:38 -0700)
tree2a93522efd6d616bc60372d945c3b43d1f2fb54f
parent4fc72d91066d8fcb6de25596429fd603d3d91d79
parentad5fe3771b50f3862130d150b5cc8bb316ef6f1c
Merge branch 'ah/grammofix'

* ah/grammofix:
  grammofix in user-facing messages
builtin/commit.c
builtin/merge.c
builtin/notes.c
git-stash.sh
git.c