path: root/builtin.h
diff options
authorJunio C Hamano <>2015-08-03 18:01:17 (GMT)
committerJunio C Hamano <>2015-08-03 18:01:17 (GMT)
commit5f02274e4c4506b923b510a24da7991656f4db14 (patch)
tree83e695ab1d81730b494bcf4ae7a6aeee6a6ff023 /builtin.h
parent0b9ce18ede8343116f4e5f008c05169f69cafc07 (diff)
parentb1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (diff)
Merge branch 'pt/pull-builtin'
Reimplement 'git pull' in C. * pt/pull-builtin: pull: remove redirection to pull --rebase: error on no merge candidate cases pull --rebase: exit early when the working directory is dirty pull: configure --rebase via branch.<name>.rebase or pull.rebase pull: teach git pull about --rebase pull: set reflog message pull: implement pulling into an unborn branch pull: fast-forward working tree if head is updated pull: check if in unresolved merge state pull: support pull.ff config pull: error on no merge candidates pull: pass git-fetch's options to git-fetch pull: pass git-merge's options to git-merge pull: pass verbosity, --progress flags to fetch and merge pull: implement fetch + merge pull: implement skeletal builtin pull argv-array: implement argv_array_pushv() parse-options-cb: implement parse_opt_passthru_argv() parse-options-cb: implement parse_opt_passthru()
Diffstat (limited to 'builtin.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index 9e04f97..839483d 100644
--- a/builtin.h
+++ b/builtin.h
@@ -98,6 +98,7 @@ extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix);
extern int cmd_patch_id(int argc, const char **argv, const char *prefix);
extern int cmd_prune(int argc, const char **argv, const char *prefix);
extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
+extern int cmd_pull(int argc, const char **argv, const char *prefix);
extern int cmd_push(int argc, const char **argv, const char *prefix);
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);