From: Chris Packham Date: Thu, 11 Mar 2010 22:08:03 GMT Subject: Re: re-running merge on a single file Message-ID: In-Reply-To: <201003112129.52596.markus.heidelberg@web.de> Hmm, having trouble with cat-file syntax On Thu, Mar 11, 2010 at 12:29 PM, Markus Heidelberg wrote: > Not mergetool, but checkout: > git checkout --merge -- file Ok. $ git checkout --merge -- cpu/mpc83xx/start.S > git cat-file blob :1:file > file.base > $ git cat-file blob :1:cpu/mpc83xx/start.S > cpu/mpc83xx/start.S.base fatal: Not a valid object name :1:cpu/mpc83xx/start.S So I think I have figured out that I'm trying to get at stage 1, 2 and 3 of the file that git checkout --merge has just setup but I'm tripping over the syntax. Also if it helps $ git --version git version 1.7.0.1