summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-10 23:24:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-10 23:24:24 (GMT)
commit5f52e70879d70b211de5d6132ed96cecaa8eaf89 (patch)
tree0dedec09294076dafac51df3bcd8d952ec5b1d42 /Documentation/git-pull.txt
parent06cfa9f31004106f8214b766fa990d451b754b66 (diff)
parent235ec24352e151bed37063a004b9800ee0debd74 (diff)
downloadgit-5f52e70879d70b211de5d6132ed96cecaa8eaf89.zip
git-5f52e70879d70b211de5d6132ed96cecaa8eaf89.tar.gz
git-5f52e70879d70b211de5d6132ed96cecaa8eaf89.tar.bz2
Merge branch 'mm/push-social-engineering-attack-doc'
Doc update on fetching and pushing. * mm/push-social-engineering-attack-doc: doc: mention transfer data leaks in more places
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 d033b25..4470e4b 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -237,6 +237,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