]> git.ipfire.org Git - thirdparty/git.git/commit - builtin-merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06d30f4 e5a78b1)
Merge branch 'lt/unitype' into js/c-merge-recursive
authorJunio C Hamano <junkio@cox.net>
Fri, 14 Jul 2006 06:38:11 +0000 (23:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 14 Jul 2006 06:38:40 +0000 (23:38 -0700)
commitbf6d324e7333f62f6aee56ebb886e82e1f49e1ce
tree946411bff17166b4d30cc7cfec4b8583a05382a7tree | snapshot
parent06d30f4f3eea71bce4cf48db3ea384976b3983b7commit | diff
parente5a78b1ca8b62aee8567d67f0e0db5ac7706806acommit | diff
Merge branch 'lt/unitype' into js/c-merge-recursive

* lt/unitype:
  builtin-prune.c: forgot TYPE => OBJ changes.
  Remove TYPE_* constant macros and use object_type enums consistently.
commit.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | | blob | history
upload-pack.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.