Merge branch 'jt/lazy-object-fetch-fix'

diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index cece4fd537e6282c391ab6582bdd37f571ec4ee8..dfd9418778a80a209e8ceb43aa94dbb4259f91db 100755 (executable)
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -75,7 +75,7 @@ fi
 # results that don't differ between the two trees.
 if ! test -d "$tmp/worktree"
 then
-       git worktree add --detach "$tmp/worktree" "$from" &&
+       git worktree add -f --detach "$tmp/worktree" "$from" &&
        dots=$(echo "$tmp/worktree" | sed 's#[^/]*#..#g') &&
        ln -s "$dots/config.mak" "$tmp/worktree/config.mak"
 fi