X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-push.c;h=356d7c1fd3a6fae9558e93eb4f240242a60da368;hb=61ed71dcff8448b0700ef032aa1f962649306624;hp=752121f2479eb9d3d9e60726645f204f676a5bd3;hpb=958742ba43a0e3847cc7095869f0d96febe47132;p=git.git diff --git a/builtin-push.c b/builtin-push.c index 752121f24..356d7c1fd 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -158,7 +158,7 @@ static int do_push(const char *repo, int flags) error("failed to push some refs to '%s'", url[i]); if (nonfastforward && advice_push_nonfastforward) { 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" + "Merge the remote changes before pushing again. See the 'non-fast-forward'\n" "section of 'git push --help' for details.\n"); } errs++;