projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 45bb6cb e28efb1)
Merge branch 'jc/fake-ancestor-with-non-blobs' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 23:14:22 +0000 (15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 23:14:22 +0000 (15:14 -0800)
commit427c6d0caf0caee5ad2c4925910a6b8ebcf95408
treeea73fd905a86866dfb95976b13f2e1cda00bbd67tree | snapshot
parent45bb6cbb49699a64196ed866c4809cd8267bd481commit | diff
parente28efb1998bb0b73057de13b9568f6aef439a583commit | diff
Merge branch 'jc/fake-ancestor-with-non-blobs' into maint

Rebasing the history of superproject with change in the submodule
has been 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—the stupid content tracker