diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-08-08 09:51:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:15:47 -0700 |
| commit | 07436e43daf1a97d3d702090d6289f745bd5ad90 (patch) | |
| tree | e8f0cbf00412a6028e5b1f12a8f9f55383bfc1d2 /transport.h | |
| parent | e89df7dcda9836518a68cce27231625f90d94749 (diff) | |
| download | git-07436e43daf1a97d3d702090d6289f745bd5ad90.tar.gz | |
push: point to 'git pull' and 'git push --force' in case of non-fast forward
'git push' failing because of non-fast forward is a very common situation,
and a beginner does not necessarily understand "fast forward" immediately.
Add a new section to the git-push documentation and refer them to it.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.h')
| -rw-r--r-- | transport.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/transport.h b/transport.h index 51b539778c..639f13dcfe 100644 --- a/transport.h +++ b/transport.h @@ -68,7 +68,8 @@ int transport_set_option(struct transport *transport, const char *name, const char *value); int transport_push(struct transport *connection, - int refspec_nr, const char **refspec, int flags); + int refspec_nr, const char **refspec, int flags, + int * nonfastforward); const struct ref *transport_get_remote_refs(struct transport *transport); |