Merge branch 'pt/pull-builtin' into maint
commitc7997e54a5dd75803657b25aea101255f388ac08
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:32 +0000 (16 14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:32 +0000 (16 14:32 -0700)
tree2dc49a343351b57281ba5f1b06f6fe3133ef3610
parent22f698cb188243b313e024d618283e0293e37140
parente7a7401f8ba22995708fb015b7c75f45256e05bf
Merge branch 'pt/pull-builtin' into maint

* pt/pull-builtin:
  pull: enclose <options> in brackets in the usage string
  merge: grammofix in please-commit-before-merge message
builtin/pull.c
contrib/examples/git-pull.sh