summaryrefslogtreecommitdiffstats
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-16 00:56:44 +0200
committerJunio C Hamano <gitster@pobox.com>2011-05-16 00:56:44 +0200
commit92b501f2a022b2de374737a79a96ea14f52fe3c9 (patch)
treed197ca70d59ce763addf58efe15387f3856fe209 /git-mergetool.sh
parentMerge branch 'vh/git-svn-doc' into maint (diff)
parentpretty: quote rfc822 specials in email addresses (diff)
downloadgit-92b501f2a022b2de374737a79a96ea14f52fe3c9.tar.xz
git-92b501f2a022b2de374737a79a96ea14f52fe3c9.zip
Merge branch 'jk/format-patch-quote-special-in-from' into maint
* jk/format-patch-quote-special-in-from: pretty: quote rfc822 specials in email addresses
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions