From: linux@horizon.com Date: Wed, 30 Nov 2005 06:09:06 GMT Subject: Re: git-name-rev off-by-one bug Message-ID: <20051130060906.13277.qmail@science.horizon.com> In-Reply-To: > +-0 -1 -2:: > + When an unmerged entry is seen, diff against the base version, > + the "first branch" or the "second branch" respectively. > + > + The default is to diff against the first branch. > + Er... why are these flags zero-based? git-ls-files -s displays them as "1", "2" and "3". All the docs talk about "stage1", "stage2" and "stage3". Change the nomenclature if you want, but this mixed messages business is kind of weird... (Heartened by the response to my previous question of "why do you do this thing that makes no sense to me", I'm going to be bold and not ask why this is a good idea.)