From afc333449e7206edf4db0a5b6f8f220d27030a33 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 6 Feb 2015 13:03:20 +0530
Subject: [PATCH] Make updating calibre on file mirrors robust against history
 rewriting

---
 setup/file_hosting_servers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/file_hosting_servers.rst b/setup/file_hosting_servers.rst
index 661f76df13..122b985a0b 100644
--- a/setup/file_hosting_servers.rst
+++ b/setup/file_hosting_servers.rst
@@ -31,7 +31,7 @@ scp -r ~/work/vim/zsh-syntax-highlighting $server:work/vim
 scp -r ~/work/vim/zsh-history-substring-search $server:work/vim
 
 cd /usr/local && git clone https://github.com/kovidgoyal/calibre.git
-echo '#!/bin/sh\ncd /usr/local/calibre && git pull -q' > /usr/local/bin/update-calibre && chmod +x /usr/local/bin/update-calibre
+echo '#!/bin/sh\ncd /usr/local/calibre && git fetch -q && git reset --hard -q origin/master' > /usr/local/bin/update-calibre && chmod +x /usr/local/bin/update-calibre
 
 Edit /etc/default/rcS and set
 FSCKFIX=yes