From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19877 invoked by alias); 10 Apr 2015 03:40:19 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 34869 Received: (qmail 3974 invoked from network); 10 Apr 2015 03:40:17 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.2 Date: Fri, 10 Apr 2015 09:16:20 +0800 From: Han Pingtian To: zsh-workers@zsh.org Subject: Re: git pull failed Message-ID: <20150410011620.GK2805@localhost.localdomain> Mail-Followup-To: zsh-workers@zsh.org References: <20150409070233.GI2805@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15041003-0009-0000-0000-000009FEAB3F On Thu, Apr 09, 2015 at 09:51:49AM +0200, Mikael Magnusson wrote: > I guess someone did a push -f, which they definitely should not be > doing on a public repo. You were unlucky and pulled the commit that > was since deleted. You can get back to a normal state by issuing > git reset --hard origin/master > (this will delete any committed or uncommited changes you have on the > local master branch). Thanks! It works just fine.