kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2015-10-16 14:32:32 -07:00
parent 22f698cb18 e7a7401f8b
commit c7997e54a5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
advice.c
View File

@ -100,7 +100,7 @@ void NORETURN die_conclude_merge(void)
{ {
error(_("You have not concluded your merge (MERGE_HEAD exists).")); error(_("You have not concluded your merge (MERGE_HEAD exists)."));
if (advice_resolve_conflict) 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.")); die(_("Exiting because of unfinished merge."));
} }



2
builtin/pull.c
View File

@ -66,7 +66,7 @@ static int parse_opt_rebase(const struct option *opt, const char *arg, int unset
} }


static const char * const pull_usage[] = { static const char * const pull_usage[] = {
N_("git pull [options] [<repository> [<refspec>...]]"), N_("git pull [<options>] [<repository> [<refspec>...]]"),
NULL NULL
}; };



2
contrib/examples/git-pull.sh
View File

@ -69,7 +69,7 @@ as appropriate to mark resolution and make a commit.")"
die_merge () { die_merge () {
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists). 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 else
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")" die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
fi fi