Re: [gitk] [PATCH] 0/2 Merging master into dev
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 11, 2009, 16:52 UTC
- Message-ID
- <alpine.DEB.1.00.0911111751370.19111@intel-tinevez-2-302>
- In-Reply-To
- <871vkbw7x2.fsf@users.sourceforge.net>
Hi (especially "Hi Paul"),
On Sat, 6 Nov 2009, Pat Thoyts wrote:
Show 16 quoted lines
> I've merged the current changes for gitk master onto the dev branch and > fixed some conflicts and then modified the default colour assignments > for windows to use the system colours so that it will pick up the stock > colours defined via the windows property pages. > > However, I'm not too certain how to post such a merge commit. Usually I > do 'git format-patch -M' but in this case that emits all the commits > that were merged. It looks like 'git show -p' is producing a merge patch > so I am posting that for 1/2 and a normal patch for 2/2. If there is > better way let me know and I will redo. > > Note: these patches are for the gitk dev branch. > > Hopefully this themed tk version is suitable for merging up to master > soon as this will significantly improve the look of the application in > msysGit.
I have no illusions about the priority of msysGit-related patches for gitk, but it would be nice to get this going again. (And I want to avoid forking gitk just for msysGit.)
Paul?
Ciao, Dscho