From mboxrd@z Thu Jan  1 00:00:00 1970
From: nicolas.pouillard@gmail.com (Nicolas Pouillard)
Date: Tue, 08 Sep 2009 22:28:56 +0200
Subject: [sup-talk] master branch merge report
In-Reply-To: <1252440062-sup-8543@masanjin.net>
References: <1252438950-sup-3895@masanjin.net> <1252439403-sup-6192@peray>
	<1252440062-sup-8543@masanjin.net>
Message-ID: <1252441390-sup-9847@peray>

Excerpts from William Morgan's message of Tue Sep 08 22:05:14 +0200 2009:
> Reformatted excerpts from Nicolas Pouillard's message of 2009-09-08:
> > Thanks for these reports on the status of branches. They are really
> > precious.  May ask for more? :) I would like you to also report on the
> > status of what is merged in next (or not yet merged in master).
> 
> The only branches not merged into master at this point are
> preemptive-loading and alignment-tweaks. This is based on a gut estimate
> of whether they need to bake a little longer.

OK nice.

> You can always get a complete report by using git wtf
> (http://git-wt-commit.rubyforge.org/git-wtf). `git wtf -r -s master` and
> `git wtf -r -s next` will show you what's merged into master and next
> respectively.

I already use git-wtf (thanks for this tool BTW), with still some pain though.

These two commands outputs ~60 lines about dozen of branches. However that's
mainly due to the fact that I do have private branches.

It would be nice to simply ask differences between to branches in terms of
merged branches: git wtf mainline/master..mainline/next

> I've also just merged custom-search-hook into master, with some effort.

Thanks

-- 
Nicolas Pouillard
http://nicolaspouillard.fr