summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-09-06 07:39:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-09-06 07:39:32 (GMT)
commit6ea71fe7d36cf5b81c2100d97a822ecf0bc04746 (patch)
tree5058d69aa6616677f6ea39ceae41eef1ed89959e
parent3fb9d58235ce4985689840b901aecacc6e3bd094 (diff)
parent14b772a0d7cb983ab0c13d672ea89192c460d070 (diff)
downloadgit-6ea71fe7d36cf5b81c2100d97a822ecf0bc04746.zip
git-6ea71fe7d36cf5b81c2100d97a822ecf0bc04746.tar.gz
git-6ea71fe7d36cf5b81c2100d97a822ecf0bc04746.tar.bz2
Merge branch 'maint'
* maint: push: re-flow non-fast-forward message push: fix english in non-fast-forward message
-rw-r--r--builtin-push.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-push.c b/builtin-push.c
index 67f6d96..787011f 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -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++;
}