git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1577884 e28efb1)
Merge branch 'jc/fake-ancestor-with-non-blobs'
authorJunio C Hamano <redacted>
Wed, 6 Feb 2013 00:13:11 +0000 (16:13 -0800)
committerJunio C Hamano <redacted>
Wed, 6 Feb 2013 00:13:12 +0000 (16:13 -0800)
commit6d81ce0543c2fb7177c08491ba31a69aa54b7930
tree6ef8352fb4ee054fca615d4b525bfa43c50b5686tree | snapshot
parent15778842bd5a63a2550c3d213b157823610a4f08commit | diff
parente28efb1998bb0b73057de13b9568f6aef439a583commit | diff
Merge branch 'jc/fake-ancestor-with-non-blobs'

Rebasing the history of superproject with change in the submodule
was broken since v1.7.12.

* jc/fake-ancestor-with-non-blobs:
  apply: diagnose incomplete submodule object name better
  apply: simplify build_fake_ancestor()
  git-am: record full index line in the patch used while rebasing
builtin/apply.c diff1 | diff2 | blob | history
git-am.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT