Merge branch 'jc/fsck-reflog'
commite8b4029f990907e24fac0e7772ee19ee6dd55c1c
authorJunio C Hamano <junkio@cox.net>
Wed, 27 Dec 2006 07:47:40 +0000 (26 23:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 27 Dec 2006 07:47:40 +0000 (26 23:47 -0800)
treeb3b799be8af66f36bd4a09d0b5ed3d8f03136dab
parent268b827d9883e77f395a63e4afa10ebbac10bfcf
parent7dc269230761e32e663d9cd0b6f4c316466a490d
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
.gitignore
Makefile
builtin.h
git.c
revision.c