Documentation: Add definition of "evil merge" to GIT Glossary

diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 7dc2df3044e82e20fbb99ae86f0a150c08cd027d..4deabc376c6698408bee032409434bd7e32740a4 100644 (file)
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -39,6 +39,10 @@ commit-id::
 
                <commit-id>['\t'<filename-as-in--w>]
 
+--recover::
+       Verify that everything reachable from target is fetched.  Used after
+       an earlier fetch is interrupted.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>