]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* nd/maint-fix-replace:
  parse_object: pass on the original sha1, not the replaced one

1  2 
object.c patch | diff1 | diff2 | blob | history
t/t6050-replace.sh patch | diff1 | diff2 | blob | history

diff --cc object.c
Simple merge
diff --cc t/t6050-replace.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.