From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steve Dickson <SteveD@redhat.com>
Subject: Re: [PATCH][RFC] NFS: Adding hooks to enable the
	use of FS-Cache
Date: Fri, 21 Apr 2006 11:56:45 -0400
Message-ID: <444900BD.1030903@RedHat.com>
References: <4448F6E1.2060907@RedHat.com>	
	<1145633490.8150.17.camel@lade.trondhjem.org>
	<4448FD65.7060007@RedHat.com>
	<1145634832.8150.22.camel@lade.trondhjem.org>
Reply-To: Linux filesystem caching discussion list <linux-cachefs@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Andrew Morton <akpm@osdl.org>, linux-fsdevel@vger.kernel.org,
	linux-cachefs@redhat.com
Return-path: <linux-cachefs-bounces@redhat.com>
To: Trond Myklebust <trond.myklebust@fys.uio.no>
In-Reply-To: <1145634832.8150.22.camel@lade.trondhjem.org>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/linux-cachefs>,
	<mailto:linux-cachefs-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/linux-cachefs>
List-Post: <mailto:linux-cachefs@redhat.com>
List-Help: <mailto:linux-cachefs-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/linux-cachefs>,
	<mailto:linux-cachefs-request@redhat.com?subject=subscribe>
Sender: linux-cachefs-bounces@redhat.com
Errors-To: linux-cachefs-bounces@redhat.com
List-Id: linux-fsdevel.vger.kernel.org

Trond Myklebust wrote:
> 'git fetch' or 'git pull'? You almost always want to do the latter,
> since the former doesn't attempt to merge the changes into your
> repository.
ah... I did the former... thanks...

steved.