Re: Useful tracking branches and auto merging

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Oct 10, 2010 at 8:15 PM, Clemens Buchacher <drizzd@xxxxxx> wrote:
> On Mon, Oct 04, 2010 at 11:56:02PM +0300, Felipe Contreras wrote:
>>
>> Moreover, wouldn't it make sense to make 'git merge' = 'git merge
>> @{u}'?
>
> Isn't that what 'git pull' does? Especially after using 'git
> fetch'?

No, it hits the network again: git pull = git fetch + git merge @{u}

If I already did 'git fetch' why should I do it again?

> I prefer 'git merge' as one of the few git commands without magic
> behavior and DWIMery.

There's no magic involved, it's just what you would expect, what else
should 'git merge' (without arguments) do?

-- 
Felipe Contreras
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]