Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt
index 565719ed5f8516e17229ec11bbec5e1354580397..d77a45aed678522344d58498f1ee20ca14e0895e 100644 (file)
--- a/Documentation/gitglossary.txt
+++ b/Documentation/gitglossary.txt
@@ -16,8 +16,10 @@ include::glossary-content.txt[]
 
 SEE ALSO
 --------
-linkgit:gittutorial[7], linkgit:gittutorial-2[7],
-linkgit:everyday[7], linkgit:gitcvs-migration[7],
+linkgit:gittutorial[7],
+linkgit:gittutorial-2[7],
+linkgit:gitcvs-migration[7],
+link:everyday.html[Everyday git],
 link:user-manual.html[The Git User's Manual]
 
 GIT