summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-06 10:50:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-06 10:50:18 -0700
commitace8ebbcf5f07a5519cbeb0ae0571d8b40222e34 (patch)
treecb7b4bf9560d6751816f1ac79caaccf27611aa25 /resolve-undo.c
parentMerge branch 'nd/struct-pathspec' (diff)
parentpretty: quote rfc822 specials in email addresses (diff)
downloadtgif-ace8ebbcf5f07a5519cbeb0ae0571d8b40222e34.tar.xz
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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions