From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH 0/3] libata: scsi error handling, encore Date: Tue, 18 Oct 2005 17:06:24 -0400 Message-ID: <435563D0.7050502@pobox.com> References: <43490BC8.9060504@torque.net> <434919E4.1080601@pobox.com> <435069E3.90306@torque.net> <43506AA3.3030502@pobox.com> <43507BA7.6090406@torque.net> <43507D5F.2050407@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <43507D5F.2050407@gmail.com> Sender: linux-scsi-owner@vger.kernel.org To: Tejun Heo Cc: dougg@torque.net, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, russb@emc.com List-Id: linux-ide@vger.kernel.org Tejun Heo wrote: > $ cat ~/bin/git-sync.sh > #!/bin/sh > > if [ ! -r .git/origin ]; then > echo "not in git repo" 2>&1 > exit 1 > fi > > rsync -avz --ignore-existing $(cat .git/origin)/ .git/ > rsync -avz $(cat .git/origin)/refs/ .git/refs/ > > After syncing, you need to do 'git-read-tree -m upstream' > 'git-checkout-cache -q -f -u -a' In the fast-moving world of git, this is a bit outdated. You should use git checkout -f upstream to check out a specific branch. Jeff