* [sup-talk] master branch merge report
@ 2009-09-08 19:45 William Morgan
2009-09-08 19:51 ` Nicolas Pouillard
0 siblings, 1 reply; 4+ messages in thread
From: William Morgan @ 2009-09-08 19:45 UTC (permalink / raw)
On preparation for an 0.9 release, I've merged the following branches
into master (in case anyone's keeping track!): console-mode,
reply-all-keybindings, restore-state, logging-tweaks,
enclosed-message-display-tweaks, hook-local-vars.
If anyone's running master, keep an eye out for changes and problems.
--
William <wmorgan-sup at masanjin.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [sup-talk] master branch merge report
2009-09-08 19:45 [sup-talk] master branch merge report William Morgan
@ 2009-09-08 19:51 ` Nicolas Pouillard
2009-09-08 20:05 ` William Morgan
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Pouillard @ 2009-09-08 19:51 UTC (permalink / raw)
Excerpts from William Morgan's message of Tue Sep 08 21:45:32 +0200 2009:
> On preparation for an 0.9 release, I've merged the following branches
> into master (in case anyone's keeping track!): console-mode,
> reply-all-keybindings, restore-state, logging-tweaks,
> enclosed-message-display-tweaks, hook-local-vars.
>
> If anyone's running master, keep an eye out for changes and problems.
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).
--
Nicolas Pouillard
http://nicolaspouillard.fr
^ permalink raw reply [flat|nested] 4+ messages in thread
* [sup-talk] master branch merge report
2009-09-08 19:51 ` Nicolas Pouillard
@ 2009-09-08 20:05 ` William Morgan
2009-09-08 20:28 ` Nicolas Pouillard
0 siblings, 1 reply; 4+ messages in thread
From: William Morgan @ 2009-09-08 20:05 UTC (permalink / raw)
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.
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've also just merged custom-search-hook into master, with some effort.
--
William <wmorgan-sup at masanjin.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [sup-talk] master branch merge report
2009-09-08 20:05 ` William Morgan
@ 2009-09-08 20:28 ` Nicolas Pouillard
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Pouillard @ 2009-09-08 20:28 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-09-08 20:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-08 19:45 [sup-talk] master branch merge report William Morgan
2009-09-08 19:51 ` Nicolas Pouillard
2009-09-08 20:05 ` William Morgan
2009-09-08 20:28 ` Nicolas Pouillard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox