summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-25 12:05:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-25 12:05:35 -0700
commit407abbabe526ae37124794e0b09108dce129870e (patch)
tree5fda57be65a0f2ed553a89673b09a0c913c794fe /git-mergetool.sh
parentMerge branch 'jk/ident-split-fix' (diff)
parentavoid segfault when reading header of malformed commits (diff)
downloadtgif-407abbabe526ae37124794e0b09108dce129870e.tar.xz
Merge branch 'jk/pretty-commit-header-incomplete-line'
Fixes error codepath when a malformed commit object has a header line chomped in the middle.
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions