summaryrefslogtreecommitdiff
path: root/pod/perlgit.pod
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2015-10-08 16:07:06 +0100
committerDavid Mitchell <davem@iabyn.com>2015-10-08 16:19:39 +0100
commit6fc2106e6704b632dc6ea04410ea89e1fa4ca43c (patch)
treeb53e9cfe99828128c4b0e9c5c26367edda2ec3e4 /pod/perlgit.pod
parent0648b1fdb6985f3b6857b4eb2281b7f3bb68f661 (diff)
downloadperl-6fc2106e6704b632dc6ea04410ea89e1fa4ca43c.tar.gz
perlgit.pod: how to unescape 'git am' From lines
Due to Reasons, some UNIX mail systems escape any leading 'From ' lines with a '>'. Explain how to un-escape them.
Diffstat (limited to 'pod/perlgit.pod')
-rw-r--r--pod/perlgit.pod5
1 files changed, 5 insertions, 0 deletions
diff --git a/pod/perlgit.pod b/pod/perlgit.pod
index 3eb0dbbdd6..f5d4fec14e 100644
--- a/pod/perlgit.pod
+++ b/pod/perlgit.pod
@@ -616,6 +616,11 @@ C<git am>:
% git am 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
Applying Rename Leon Brocard to Orange Brocard
+Note that some UNIX mail systems can mess with text attachments containing
+'From '. This will fix them up:
+
+ % perl -pi -e's/^>From /From /' 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
+
If just a raw diff is provided, it is also possible use this two-step
process: