Matthieu MoyThe error message in case of non-fast forward points to 'git push --help', but used to talk about a section 'non-fast-forward', while the actual section name is 'Note about fast-forwards'.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- My bad, I'm the original author of the patch introducing this ;-).
builtin-push.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Show changes to builtin-push.c +2 −2
diff --git a/builtin-push.c b/builtin-push.c index f7661d2..28a26e7 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -125,8 +125,8 @@ static int push_with_options(struct transport *transport, int flags) 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" - "section of 'git push --help' for details.\n"); + "Merge the remote changes before pushing again. See the 'Note about\n" + "fast-forwards' section of 'git push --help' for details.\n"); } return 1;
-- 1.6.6.198.gbaea2