aboutsummaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-23 14:44:31 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-23 14:44:31 -0700
commit1af0d11283ee34127a4ee877fb753db021d399ea (patch)
tree9792099056c1cc157640898576a782086cb860d0 /builtin.h
parente8cc9cd98e2ecd7fd8bb03e725d470405c8e2b94 (diff)
parent217542640ed219c980fff2b3c307c4520120f20f (diff)
downloadgit-1af0d11283ee34127a4ee877fb753db021d399ea.tar.gz
git-1af0d11283ee34127a4ee877fb753db021d399ea.tar.xz
Merge branch 'jc/tartree' into jc/builtin-n-tar-tree
* jc/tartree: built-in tar-tree and remote tar-tree
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin.h b/builtin.h
index 762098462..2249c5fae 100644
--- a/builtin.h
+++ b/builtin.h
@@ -27,9 +27,10 @@ extern int cmd_grep(int argc, const char **argv, char **envp);
extern int cmd_rev_list(int argc, const char **argv, char **envp);
extern int cmd_check_ref_format(int argc, const char **argv, char **envp);
extern int cmd_init_db(int argc, const char **argv, char **envp);
+extern int cmd_tar_tree(int argc, const char **argv, char **envp);
+extern int cmd_upload_tar(int argc, const char **argv, char **envp);
extern int cmd_ls_files(int argc, const char **argv, char **envp);
extern int cmd_ls_tree(int argc, const char **argv, char **envp);
-extern int cmd_tar_tree(int argc, const char **argv, char **envp);
extern int cmd_read_tree(int argc, const char **argv, char **envp);
extern int cmd_commit_tree(int argc, const char **argv, char **envp);
extern int cmd_apply(int argc, const char **argv, char **envp);
@@ -39,5 +40,4 @@ extern int cmd_diff_index(int argc, const char **argv, char **envp);
extern int cmd_diff_stages(int argc, const char **argv, char **envp);
extern int cmd_diff_tree(int argc, const char **argv, char **envp);
-
#endif