| commit | 130b04ab37d74e574d525df7948b963b13c6bdbf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 25 Jul 2009 07:45:03 +0000 (25 00:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 25 Jul 2009 07:45:03 +0000 (25 00:45 -0700) | ||
| tree | a39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581 | treesnapshot (tar.gz zip) |
| parent | a7c1ef3e03985c70aeb0825634471bb6240f4fcb | commitdiff |
| parent | 7f3140cd23f126e578ccaaea8c2cebe36824a7ac | commitdiff |
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
* 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 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| commit.c | diff1 | diff2 | blobhistory |
| environment.c | diff1 | diff2 | blobhistory |
| git-repack.sh | diff1 | diff2 | blobhistory |