The state and future of the git/mingw** reposiories?

  Hi,

  I'm currently doing some MSysGit hacking (mostly git-gui-related) and
I'm wondering what should I actually base my work on, considering the
statement of 1.6.0 release notes:

	Source changes needed for porting to MinGW environment are now
	all in the main git.git codebase.

However, git diff junio/master...mingw/master shows quite a few differences - is there any plan to merge these? If so, do you plan to maintain the mingw fork indefinitely anyway as a staging area for your patches that you plan to push upstream, or is it going to be phased out eventually?

I'm even more confused about the git/mingw/4msysgit.git repository, though. The branches here seem to be ... *insert 10 minutes of clicking through dense gitk graphs* ... random mix of git.git and git/mingw.git merges, but git diff mingw/master...origin/devel turns out to be fairly minimal - still, some of the changes look quite generic. Again, is there any upstream merge plan?

What is the branch structure of git/mingw/4msysgit.git? The 'master' branch still points to 1.5.6, the 'next' branch points to something... I can't quite pinpoint and the 'devel' branch seems to be 1.6.0 + mingw/master. Who is supposed to use which one?

Overally, the situation seems to be quite confusing - I would appreciate a lot if you could clarify the relationship between all the forks and their branches. It would be great to have this in the project READMEs at repo.or.cz so that casual visitors get this knowledge. I tried to look around quite a bit, but could not find any up-to-date description of this; if I missed it, please point me at the right place.

Thanks,