summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-21 23:55:00 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-21 23:55:00 -0700
commitc831da664799eb4dbf082a843c34c66889548768 (patch)
tree94c532ee014a80c74b1ba54a188ef3d4910b7784 /git-merge-ours.sh
parentCMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields. (diff)
downloadtgif-c831da664799eb4dbf082a843c34c66889548768.tar.xz
builtin format-patch: squelch content-type for 7-bit ASCII
When --attach is not used, usually we do not say Content-Type: and fluff, but if the commit message is not 7-bit ASCII, mark it as "text/plain; charset=UTF-8". This unclutters output somewhat. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions