Merge branch 'maint'
* maint: push: re-flow non-fast-forward message push: fix english in non-fast-forward message
This commit is contained in:
commit
6ea71fe7d3
@ -158,9 +158,9 @@ static int do_push(const char *repo, int flags)
|
||||
|
||||
error("failed to push some refs to '%s'", url[i]);
|
||||
if (nonfastforward) {
|
||||
printf("To prevent you from losing history, non-fast-forward updates were rejected.\n"
|
||||
"Merge the remote changes before pushing again.\n"
|
||||
"See 'non-fast forward' section of 'git push --help' for details.\n");
|
||||
printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
|
||||
"Merge the remote changes before pushing again. See the 'non-fast forward'\n"
|
||||
"section of 'git push --help' for details.\n");
|
||||
}
|
||||
errs++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user