path: root/transport.h
diff options
authorMatthieu Moy <>2009-08-08 07:51:08 (GMT)
committerJunio C Hamano <>2009-08-12 23:15:47 (GMT)
commit07436e43daf1a97d3d702090d6289f745bd5ad90 (patch)
treee8f0cbf00412a6028e5b1f12a8f9f55383bfc1d2 /transport.h
parente89df7dcda9836518a68cce27231625f90d94749 (diff)
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 <> Signed-off-by: Junio C Hamano <> Signed-off-by: Nanako Shiraishi <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'transport.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/transport.h b/transport.h
index 51b5397..639f13d 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);