diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:14:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:14:22 -0800 |
| commit | 427c6d0caf0caee5ad2c4925910a6b8ebcf95408 (patch) | |
| tree | ea73fd905a86866dfb95976b13f2e1cda00bbd67 /prompt.c | |
| parent | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint (diff) | |
| parent | apply: diagnose incomplete submodule object name better (diff) | |
| download | tgif-427c6d0caf0caee5ad2c4925910a6b8ebcf95408.tar.xz | |
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
Diffstat (limited to 'prompt.c')
0 files changed, 0 insertions, 0 deletions