diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:11:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:11:36 -0700 |
| commit | 703319313fc2878c0c28ccc14a488024e8687fc2 (patch) | |
| tree | 98ead8765fa14f86b491b72896aa3f19871f692f /git-mergetool.sh | |
| parent | 1fc0bfd65ac50c7c2e2a4ae263cf8ee90c106ce6 (diff) | |
| parent | de5abe9fe91a496d019d62abefe23df9d72fad30 (diff) | |
| download | git-703319313fc2878c0c28ccc14a488024e8687fc2.tar.gz | |
Merge branch 'jk/chopped-ident'
A commit object whose author or committer ident are malformed
crashed some code that trusted that a name, an email and an
timestamp can always be found in it.
* jk/chopped-ident:
blame: handle broken commit headers gracefully
pretty: handle broken commit headers gracefully
cat-file: print tags raw for "cat-file -p"
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions