]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd1547d 2e3400c)
Merge branch 'nd/maint-fix-replace'
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 05:23:13 +0000 (22:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 05:23:13 +0000 (22:23 -0700)
commitf92d62ec4ead67109418483b65aaf158b7462121
tree41c8b17b55ec094911c29c78a1067ba6e629daf7tree | snapshot
parentcd1547d2049f32a5c13ba1828fcd1a553b844e97commit | diff
parent2e3400c0521e4997601916790b8b2a9ff588c6f3commit | diff
Merge branch 'nd/maint-fix-replace'

* nd/maint-fix-replace:
  parse_object: pass on the original sha1, not the replaced one
object.c diff1 | diff2 | blob | history
t/t6050-replace.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.