Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / tips / untrusted_git_push / discussion.mdwn

diff --git a/doc/tips/untrusted_git_push/discussion.mdwn b/doc/tips/untrusted_git_push/discussion.mdwn
index d433d61d444f019add7ed6fc237d5c2a77b64799..e85625a1b9b142406e4dbb4d1307009f43297a7b 100644 (file)
--- a/doc/tips/untrusted_git_push/discussion.mdwn
+++ b/doc/tips/untrusted_git_push/discussion.mdwn
@@ -29,3 +29,5 @@ changeset contains. -- [[JonDowland]]
 > All ikiwiki can do it look at who git has recorded as the author of
 > the change (and it looks at the username part of the email address).
 > You can set `user.email` in `.git/config`. --[[Joey]]
 > All ikiwiki can do it look at who git has recorded as the author of
 > the change (and it looks at the username part of the email address).
 > You can set `user.email` in `.git/config`. --[[Joey]]

+
+> > Ah, excellent. In which case this *should* DTRT... -- [[JonDowland]]