From: Junio C Hamano Date: Sat, 4 Sep 2010 05:23:13 +0000 (-0700) Subject: Merge branch 'nd/maint-fix-replace' X-Git-Tag: v1.7.3-rc0~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f92d62ec4ead67109418483b65aaf158b7462121;p=git.git Merge branch 'nd/maint-fix-replace' * nd/maint-fix-replace: parse_object: pass on the original sha1, not the replaced one --- f92d62ec4ead67109418483b65aaf158b7462121