From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: Guided merge with override Date: Tue, 17 Jun 2008 10:48:38 +0100 (BST) Message-ID: References: <93c3eada0806152116v2cef4035u272dc1a26005661a@mail.gmail.com> <20080616092554.GB29404@genesis.frugalware.org> <48563D6C.8060704@viscovery.net> <485756AE.9050904@viscovery.net> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Johannes Sixt , Miklos Vajna , Geoff Russell , git@vger.kernel.org To: sverre@rabbelier.nl X-From: git-owner@vger.kernel.org Tue Jun 17 11:51:21 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1K8XqL-0007sZ-1X for gcvg-git-2@gmane.org; Tue, 17 Jun 2008 11:51:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752240AbYFQJuS (ORCPT ); Tue, 17 Jun 2008 05:50:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752057AbYFQJuR (ORCPT ); Tue, 17 Jun 2008 05:50:17 -0400 Received: from mail.gmx.net ([213.165.64.20]:39318 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752240AbYFQJuQ (ORCPT ); Tue, 17 Jun 2008 05:50:16 -0400 Received: (qmail invoked by alias); 17 Jun 2008 09:50:14 -0000 Received: from almond.st-and.ac.uk (EHLO almond.st-and.ac.uk) [138.251.155.241] by mail.gmx.net (mp034) with SMTP; 17 Jun 2008 11:50:14 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX1/j/a1HLQ/j5UwCUqfr/6iosy4Ub4i4TxIkHXg/6w arGKBtEnHzp0rF X-X-Sender: gene099@racer In-Reply-To: User-Agent: Alpine 1.00 (DEB 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Tue, 17 Jun 2008, Sverre Rabbelier wrote: > How about 'git ls-files -t | grep "^M " | xargs git checkout B --', You probably meant 'sed -n "s/^M //p"' instead of 'grep "^M"', right? Of course, I think that a better way would be to ask "git diff --name-only --diff-filter=U". Ciao, Dscho