From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Oct 2015 21:32:32 +0000 (-0700)
Subject: Merge branch 'pt/pull-builtin' into maint
X-Git-Tag: v2.6.2~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c7997e54a5dd75803657b25aea101255f388ac08

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
---

c7997e54a5dd75803657b25aea101255f388ac08