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

diff --cc .gitignore
Simple merge

diff --cc Makefile
index 475047f100ef1a2a9cf73557eba3b300e74cac9d,d4d8590b6e4458e2cd49d75981b1637b4b4a1ce7..52d4a3a86a214a99bd3cf32053539e18f36778a7
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -287,8 -288,8 +287,9 @@@ BUILTIN_OBJS = 
        builtin-prune-packed.o \
        builtin-push.o \
        builtin-read-tree.o \
+       builtin-reflog.o \
        builtin-repo-config.o \
 +      builtin-rerere.o \
        builtin-rev-list.o \
        builtin-rev-parse.o \
        builtin-rm.o \

diff --cc builtin.h
index 8ffd8b2653a4879f6e5ff59d6ae8a82cae34a2ae,fdc0907eca4d056ce52da65f655e36ab52fff52e..df72d09447d0edd17d07eb97a9b3b36fa4b57531
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -51,8 -51,8 +51,9 @@@ extern int cmd_prune(int argc, const ch
  extern int cmd_prune_packed(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_reflog(int argc, const char **argv, const char *prefix);
  extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
 +extern int cmd_rerere(int argc, const char **argv, const char *prefix);
  extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
  extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
  extern int cmd_rm(int argc, const char **argv, const char *prefix);

diff --cc git.c
index e732a098fc164da10ed9f41113c7d32d1b022966,5822296e6e6ef79e6c334d7f3f2426ce8f81ff96..50ebd869ad47cb2803a5a1e581442d7e72842034
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -246,8 -244,8 +246,9 @@@ static void handle_internal_command(in
                { "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 },
                { "rev-parse", cmd_rev_parse, RUN_SETUP },
                { "rm", cmd_rm, RUN_SETUP },

diff --cc revision.c
Simple merge