Dear diary, on Thu, May 04, 2006 at 10:15:03AM CEST, I got a letter where Junio C Hamano <junkio@xxxxxxx> said that... > * Message-ID: <1143856098.3555.48.camel@dv> > Per branch property, esp. where to merge from (Pavel Roskin) > > This involves user-level "world model" design, which is more > Porcelainish than Plumbing, and as people know I do not do > Porcelain well; interested parties need to come up with what > they want and how they want to use it. Oh, my holey memory. In Cogito, I have just implemented a solution suggested by Martin Mares, which is pretty simple, non-obtrusive and will work equally fine with remotes as well as remote branches: if [ $branch != master ] && [ -s .git/branches/$branch-origin ] origin=.git/branches/$branch-origin else origin=.git/branches/origin fi -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Right now I am having amnesia and deja-vu at the same time. I think I have forgotten this before. - : 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