diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 11:31:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-24 23:50:28 -0700 |
| commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
| tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /builtin-push.c | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.gz | |
Use 'fast-forward' all over the place
It's a compound word.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-push.c')
| -rw-r--r-- | builtin-push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-push.c b/builtin-push.c index 3cb1ee46d1..e883574f03 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -159,7 +159,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++; |