diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-05 16:13:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 16:13:12 -0800 |
| commit | 6d81ce0543c2fb7177c08491ba31a69aa54b7930 (patch) | |
| tree | 6ef8352fb4ee054fca615d4b525bfa43c50b5686 /pretty.c | |
| parent | Merge branch 'sb/gpg-plug-fd-leak' (diff) | |
| parent | apply: diagnose incomplete submodule object name better (diff) | |
| download | tgif-6d81ce0543c2fb7177c08491ba31a69aa54b7930.tar.xz | |
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
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions