Mike Hommey <mh@xxxxxxxxxxxx> writes:
> On Sun, Jul 06, 2008 at 09:43:58PM -0700, Junio C Hamano wrote:
> ...
>> We would make it _appear_ rebase and merge are interchangeable even more.
>> But the thing is, I am not convinced if promoting that appearance is
>> necessarily a good thing.
>>
>> You now do not have to say something like:
>>
>> After a 'git pull' you can view 'git diff ORIG_HEAD..' to check
>> what are new, but 'git pull --rebase' is different and you would
>> say 'git diff branch@{1}.." instead.
>>
>> and you can tell the users that ORIG_HEAD can be used in both cases.
>
> And in both cases, you could use HEAD@{1} instead of ORIG_HEAD.
No you cannot. Read what I wrote again. I never said HEAD@{1} ;-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
