summaryrefslogtreecommitdiffstats
path: root/notes-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 19:50:18 +0200
committerJunio C Hamano <gitster@pobox.com>2011-05-06 19:50:18 +0200
commitace8ebbcf5f07a5519cbeb0ae0571d8b40222e34 (patch)
treecb7b4bf9560d6751816f1ac79caaccf27611aa25 /notes-merge.h
parentMerge branch 'nd/struct-pathspec' (diff)
parentpretty: quote rfc822 specials in email addresses (diff)
downloadgit-ace8ebbcf5f07a5519cbeb0ae0571d8b40222e34.tar.xz
git-ace8ebbcf5f07a5519cbeb0ae0571d8b40222e34.zip
Merge branch 'jk/format-patch-quote-special-in-from'
* jk/format-patch-quote-special-in-from: pretty: quote rfc822 specials in email addresses Conflicts: pretty.c t/t4014-format-patch.sh
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions