summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-11 22:33:51 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-11 22:33:51 -0700
commitae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9 (patch)
treeb868ef92c090819f91ced2de2c179f40030934ae /git.c
parentb85997d14d1873a4baa3d04966cd5947e6134acd (diff)
parent3000658f7c15c880f976aac0ade73efd3b1e9790 (diff)
downloadgit-ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9.tar.gz
Merge branch 'js/remote'
* js/remote: "remote update": print remote name being fetched from builtin remote rm: remove symbolic refs, too remote: fix "update [group...]" remote show: Clean up connection correctly if object fetch wasn't done builtin-remote: prune remotes correctly that were added with --mirror Make git-remote a builtin Test "git remote show" and "git remote prune" parseopt: add flag to stop on first non option path-list: add functions to work with unsorted lists Conflicts: parse-options.c
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index 9cca81a60e..1e3eb1065f 100644
--- a/git.c
+++ b/git.c
@@ -334,6 +334,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "push", cmd_push, RUN_SETUP },
{ "read-tree", cmd_read_tree, RUN_SETUP },
{ "reflog", cmd_reflog, RUN_SETUP },
+ { "remote", cmd_remote, RUN_SETUP },
{ "repo-config", cmd_config },
{ "rerere", cmd_rerere, RUN_SETUP },
{ "reset", cmd_reset, RUN_SETUP },