summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-26 23:47:40 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-26 23:47:40 -0800
commite8b4029f990907e24fac0e7772ee19ee6dd55c1c (patch)
treeb3b799be8af66f36bd4a09d0b5ed3d8f03136dab /git.c
parent268b827d9883e77f395a63e4afa10ebbac10bfcf (diff)
parent7dc269230761e32e663d9cd0b6f4c316466a490d (diff)
downloadgit-e8b4029f990907e24fac0e7772ee19ee6dd55c1c.tar.gz
Merge branch 'jc/fsck-reflog'
* jc/fsck-reflog: Add git-reflog to .gitignore reflog expire: do not punt on tags that point at non commits. reflog expire: prune commits that are not incomplete Don't crash during repack of a reflog with pruned commits. git reflog expire Move in_merge_bases() to commit.c reflog: fix warning message. Teach git-repack to preserve objects referred to by reflog entries. Protect commits recorded in reflog from pruning. add for_each_reflog_ent() iterator
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 e732a098fc..50ebd869ad 100644
--- a/git.c
+++ b/git.c
@@ -246,6 +246,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
{ "push", cmd_push, RUN_SETUP },
{ "read-tree", cmd_read_tree, RUN_SETUP },
+ { "reflog", cmd_reflog, RUN_SETUP },
{ "repo-config", cmd_repo_config },
{ "rerere", cmd_rerere, RUN_SETUP },
{ "rev-list", cmd_rev_list, RUN_SETUP },