Re: defaults for where to merge from

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

 



Hi,

On Wed, 28 Feb 2007, Paolo Bonzini wrote:

> 
> > I don't think that you should be forced to do it explicitely. If you 
> > want to merge in another branch, you can do that _explicitely_. So, 
> > defaulting to what most people want anyway is A Good Thing.
> 
> Here is a prototype patch to implement this functionality.  One problem 
> is that config.c does not remove cleaned sections, so after "git-branch 
> -d mybranch" one is left with a useless "[branch "mybranch"]" section in 
> .git/config.  Other than this, it seems to work well in my experiments.

I'd rather remove the complete section (However, that means that you have 
to introduce a function to do that in config.c) instead of unsetting 
several hardcoded values.

Also, the second part of your patch would be clearer (methinks) if you 
replaced the call to get_sha1() with dwim_ref(). You'd get the real 
refname for free...

Ciao,
Dscho

-
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]