diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-29 12:49:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 12:49:52 -0700 |
| commit | 7dae8b21c2fe39a59661c709f0dc17090dafa5a4 (patch) | |
| tree | 0063896a0043013e3b2ce8d3834586da5120d9d9 /Documentation/git-mergetool.txt | |
| parent | grep: fix segfault when "git grep '('" is given (diff) | |
| download | tgif-7dae8b21c2fe39a59661c709f0dc17090dafa5a4.tar.xz | |
diff -c -p: do not die on submodules
The combine diff logic knew only about blobs (and their checked-out form
in the work tree, either regular files or symlinks), and barfed when fed
submodules. This "externalizes" gitlinks in the same way as the normal
patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the
issue.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions