git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Sat, 25 Jul 2009 07:45:03 +0000 (00:45 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sat, 25 Jul 2009 07:45:03 +0000 (00:45 -0700)
commit	130b04ab37d74e574d525df7948b963b13c6bdbf
tree	a39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581	tree \| snapshot
parent	a7c1ef3e03985c70aeb0825634471bb6240f4fcb	commit \| diff
parent	7f3140cd23f126e578ccaaea8c2cebe36824a7ac	commit \| 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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

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