checkout -m: recreate merge when checking out of unmerged index

diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt
index e8475a042ca5866842550545f434a2071b1992a7..565719ed5f8516e17229ec11bbec5e1354580397 100644 (file)
--- a/Documentation/gitglossary.txt
+++ b/Documentation/gitglossary.txt
@@ -17,9 +17,9 @@ include::glossary-content.txt[]
 SEE ALSO
 --------
 linkgit:gittutorial[7], linkgit:gittutorial-2[7],
-linkgit:giteveryday[7], linkgit:gitcvs-migration[7],
+linkgit:everyday[7], linkgit:gitcvs-migration[7],
 link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite.
+Part of the linkgit:git[1] suite.