diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
| commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 (patch) | |
| tree | eeb42aefe5555624063221d7ddc28a29f598ce7f /builtin-push.c | |
| parent | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (diff) | |
| parent | a75d7b54097ef0d0945cbe673a9940d6c561f95c (diff) | |
| download | git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.gz git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.xz | |
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
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 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++; |