| commit | 96217272b801d04dbb79d19eb5737ee433b27d7b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:34:07 +0000 (25 12:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:34:07 +0000 (25 12:34 -0700) | ||
| tree | 5359c341a923e6d6da405260239804d2b10c4e20 | treesnapshot (tar.gz zip) |
| parent | 099cf714496962b1e575bb688c89eae23237e636 | commitdiff |
| parent | 3918057164a8060082b828c0ac1ce25ad6a86d38 | commitdiff |
Merge branch 'br/imap-send-simplify-tunnel-child-process' into jch
* br/imap-send-simplify-tunnel-child-process:
imap-send.c: imap_folder -> imap_server_conf.folder
git-imap-send: simplify tunnel construction
# Conflicts:
# imap-send.c
* br/imap-send-simplify-tunnel-child-process:
imap-send.c: imap_folder -> imap_server_conf.folder
git-imap-send: simplify tunnel construction
# Conflicts:
# imap-send.c
| imap-send.c | diff1 | diff2 | blobhistory |