Browse Source

Merge branch 'ob/messages-capitalize-exception'

Message update.

* ob/messages-capitalize-exception:
  messages: capitalization and punctuation exceptions
main
Junio C Hamano 2 years ago
parent
commit
461eea3fb8
  1. 2
      builtin/pull.c
  2. 4
      sequencer.c

2
builtin/pull.c

@ -1047,7 +1047,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) @@ -1047,7 +1047,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (!opt_autostash)
require_clean_work_tree(the_repository,
N_("pull with rebase"),
_("please commit or stash them."), 1, 0);
_("Please commit or stash them."), 1, 0);

if (get_rebase_fork_point(&rebase_fork_point, repo, *refspecs))
oidclr(&rebase_fork_point);

4
sequencer.c

@ -3627,13 +3627,13 @@ static int do_exec(struct repository *r, const char *command_line) @@ -3627,13 +3627,13 @@ static int do_exec(struct repository *r, const char *command_line)
"\n"),
command_line,
dirty ? _("and made changes to the index and/or the "
"working tree\n") : "");
"working tree.\n") : "");
if (status == 127)
/* command not found */
status = 1;
} else if (dirty) {
warning(_("execution succeeded: %s\nbut "
"left changes to the index and/or the working tree\n"
"left changes to the index and/or the working tree.\n"
"Commit or stash your changes, and then run\n"
"\n"
" git rebase --continue\n"

Loading…
Cancel
Save