projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a7c1ef3 7f3140c)
Merge branch 'js/maint-graft-unhide-true-parents'
authorJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 07:45:03 +0000 (00:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 07:45:03 +0000 (00:45 -0700)
commit130b04ab37d74e574d525df7948b963b13c6bdbf
treea39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581tree | snapshot
parenta7c1ef3e03985c70aeb0825634471bb6240f4fcbcommit | diff
parent7f3140cd23f126e578ccaaea8c2cebe36824a7accommit | diff
Merge branch 'js/maint-graft-unhide-true-parents'

* js/maint-graft-unhide-true-parents:
  git repack: keep commits hidden by a graft
  Add a test showing that 'git repack' throws away grafted-away parents

Conflicts:
git-repack.sh
builtin-pack-objects.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
commit.c diff1 | diff2 | blob | history
environment.c diff1 | diff2 | blob | history
git-repack.sh diff1 | diff2 | blob | history
Git—the stupid content tracker