X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=3a7d385225754d5c865ac333a5a65e71c4e7fb65;hb=980d8ce551784b76e05077946b8a4f2ac6c5305d;hp=c65ca9a5300096d69d540657ffd963070f429874;hpb=7141b3b78099941f25b17388f56a917d4f7af51d;p=git.git

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c65ca9a5..3a7d3852 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -104,6 +104,11 @@ merge the remote `origin` head into the current,
 local `master` branch.
 
 
+If you tried a pull which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+
 SEE ALSO
 --------
 gitlink:git-fetch[1], gitlink:git-merge[1]