Code

Merge branch 'jk/tag-contains' into pu
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:18 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:18 +0000 (19:03 -0800)
* jk/tag-contains:
  Why is "git tag --contains" so slow?
  default core.clockskew variable to one day
  limit "contains" traversals based on commit timestamp
  tag: speed up --contains calculation

1  2 
.gitignore
Makefile
builtin.h
builtin/tag.c
cache.h
commit.c
commit.h
config.c
git.c

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
diff --cc builtin.h
Simple merge
diff --cc builtin/tag.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge
diff --cc config.c
Simple merge
diff --cc git.c
Simple merge