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

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index e99921108e20f50e4c3f5d0e4beec37fbdf648f9..08d1310bf5fc5590ada1ee5b2af77d361ff4d874 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1890,7 +1890,7 @@ adjustments to give web clients some extra information they need:
 $ mv proj.git /home/you/public_html/proj.git
 $ cd proj.git
 $ git --bare update-server-info
-$ chmod a+x hooks/post-update
+$ mv hooks/post-update.sample hooks/post-update
 -------------------------------------------------
 
 (For an explanation of the last two lines, see