threads / patch / 21507

patch0/2 Merging master into dev

Subject: [gitk] [PATCH] 0/2 Merging master into dev

## tl;dr

3 messages between Nov 6, 2009 and Nov 14, 2009. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Pat Thoyts· Nov 6, 2009, 23:27 UTC · lore

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.

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD

Johannes Schindelin· Nov 11, 2009, 16:52 UTC · re: Pat Thoyts · lore

Re: [gitk] [PATCH] 0/2 Merging master into dev

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

Paul Mackerras· Nov 14, 2009, 11:20 UTC · re: Pat Thoyts · lore

Re: [gitk] [PATCH] 0/2 Merging master into dev

Pat Thoyts writes:

Show 10 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.

I don't think there is a way to send a merge commit by email. I think you would have to put a repository somewhere with the merge in it and invite me to pull it.

In any case, I have just merged the dev branch into the master branch and then applied your second patch, and pushed out the result.

Paul.