git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 20a3847)

author	Santi Béjar <redacted>
	Sun, 1 Oct 2006 03:34:17 +0000 (05:34 +0200)
committer	Junio C Hamano <redacted>
	Sun, 1 Oct 2006 05:13:28 +0000 (22:13 -0700)
commit	ba0ac36ec5708820e670731001f7ab35351c6c48
tree	67829a9b6a4f9380f6542b3d77e72a40abb8a090	tree \| snapshot
parent	20a3847d8a5032ce41f90dcc68abfb36e6fee9b1	commit \| diff

merge and resolve: Output short hashes and .. in "Updating ..."

Signed-off-by: Santi Béjar <redacted>
Signed-off-by: Junio C Hamano <redacted>

git-merge.sh		diff \| blob \| history
git-resolve.sh		diff \| blob \| history

git clone https://git.99rst.org/PROJECT