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://www.git.lorimer.id.au/gitweb.git/diff_plain/c7997e54a5dd75803657b25aea101255f388ac08?hp=22f698cb188243b313e024d618283e0293e37140

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

diff --git a/advice.c b/advice.c
index 4965686e19..4dc5cf10a8 100644
--- a/advice.c
+++ b/advice.c
@@ -100,7 +100,7 @@ void NORETURN die_conclude_merge(void)
 {
 	error(_("You have not concluded your merge (MERGE_HEAD exists)."));
 	if (advice_resolve_conflict)
-		advise(_("Please, commit your changes before you can merge."));
+		advise(_("Please, commit your changes before merging."));
 	die(_("Exiting because of unfinished merge."));
 }
 
diff --git a/builtin/pull.c b/builtin/pull.c
index a39bb0a11f..bf3fd3f9c8 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -66,7 +66,7 @@ static int parse_opt_rebase(const struct option *opt, const char *arg, int unset
 }
 
 static const char * const pull_usage[] = {
-	N_("git pull [options] [<repository> [<refspec>...]]"),
+	N_("git pull [<options>] [<repository> [<refspec>...]]"),
 	NULL
 };
 
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index e8dc2e0e7d..6b3a03f9b0 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/git-pull.sh
@@ -69,7 +69,7 @@ as appropriate to mark resolution and make a commit.")"
 die_merge () {
     if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
 	die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
-Please, commit your changes before you can merge.")"
+Please, commit your changes before merging.")"
     else
 	die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
     fi