From b7447679e84ed973430ab19fce87f56857b83068 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Thu, 1 Oct 2015 22:25:33 -0600 Subject: [PATCH 1/2] merge: grammofix in please-commit-before-merge message Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano --- advice.c | 2 +- contrib/examples/git-pull.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh index 0917d0d056..3539dc91a3 100755 --- a/contrib/examples/git-pull.sh +++ b/contrib/examples/git-pull.sh @@ -29,7 +29,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 From e7a7401f8ba22995708fb015b7c75f45256e05bf Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Thu, 15 Oct 2015 20:22:13 -0600 Subject: [PATCH 2/2] pull: enclose in brackets in the usage string All the other placeholders are already shown that way. Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano --- builtin/pull.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/pull.c b/builtin/pull.c index 722a83c51b..4f14a69884 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -65,7 +65,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] [ [...]]"), + N_("git pull [] [ [...]]"), NULL };