diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-26 23:47:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-26 23:47:40 -0800 |
| commit | e8b4029f990907e24fac0e7772ee19ee6dd55c1c (patch) | |
| tree | b3b799be8af66f36bd4a09d0b5ed3d8f03136dab /Makefile | |
| parent | everyday: update for v1.5.0 (diff) | |
| parent | Add git-reflog to .gitignore (diff) | |
| download | tgif-e8b4029f990907e24fac0e7772ee19ee6dd55c1c.tar.xz | |
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 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -287,6 +287,7 @@ 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 \ |