mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 16:36:10 +02:00
Code

Merge branch 'maint' 

* maint:
  push: re-flow non-fast-forward message
  push: fix english in non-fast-forward message
This commit is contained in:
Junio C Hamano 2009-09-06 00:39:32 -07:00
parent 3fb9d58235 14b772a0d7
commit 6ea71fe7d3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-push.c
View File

@ -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++;
}