summaryrefslogtreecommitdiff
path: root/transport.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-12 16:36:04 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-12 16:36:04 -0700
commit6ffd781226f04629eff63a684b47ad7555143312 (patch)
treee41ea02c886afd117f51b257d57f84043e447efd /transport.h
parent19a7fcbf16276321f83e0c1748b3935a2ea42675 (diff)
parent2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (diff)
downloadgit-6ffd781226f04629eff63a684b47ad7555143312.tar.gz
Merge branch 'maint'
* maint: push: point to 'git pull' and 'git push --force' in case of non-fast forward Documentation: add: <filepattern>... is optional Change mentions of "git programs" to "git commands" Documentation: merge: one <remote> is required help.c: give correct structure's size to memset()
Diffstat (limited to 'transport.h')
-rw-r--r--transport.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/transport.h b/transport.h
index f1d3ebf674..171a01c7a3 100644
--- a/transport.h
+++ b/transport.h
@@ -69,7 +69,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);