summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorLibravatar Matt McCutchen <matt@mattmccutchen.net>2016-11-14 13:20:24 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-14 11:23:07 -0800
commit235ec24352e151bed37063a004b9800ee0debd74 (patch)
tree6646f0e70a1cd42276ae6e3e4f863b2097146b69 /Documentation/git-pull.txt
parentGit 2.8.4 (diff)
downloadtgif-235ec24352e151bed37063a004b9800ee0debd74.tar.xz
doc: mention transfer data leaks in more places
The "SECURITY" section of the gitnamespaces(7) man page described two ways for a client to steal data from a server that wasn't intended to be shared. Similar attacks can be performed by a server on a client, so adapt the section to cover both directions and add it to the git-fetch(1), git-pull(1), and git-push(1) man pages. Also add references to this section from the documentation of server configuration options that attempt to control data leakage but may not be fully effective. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index a62a2a615d..0773c84de0 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -228,6 +228,8 @@ If you tried a pull which resulted in complex conflicts and
would want to start over, you can recover with 'git reset'.
+include::transfer-data-leaks.txt[]
+
BUGS
----
Using --recurse-submodules can only fetch new commits in already checked