Web lists-archives.com

Re: What's cooking in git.git (May 2019, #01; Thu, 9)




Hi Junio,

On Thu, May 09, 2019 at 02:23:24AM +0900, Junio C Hamano wrote:
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
> 
> The 8th batch of topics, which Hopefully is the final one before
> -rc0, have been pushed out to 'master'.  The "no-extern" topic is
> now in 'next', with its merge conflict with many other topics, is
> still slowing me down when it is moved earlier in the merge order.
> I expect it to need only one more topic shuffling before merged to
> 'master', so I hope I'd survive.

Thanks for taking on the hard work for this!

> 
> You can find the changes described here in the integration branches
> of the repositories listed at
> 
>     http://git-blame.blogspot.com/p/git-public-repositories.html
> 

[snip]

> * dl/difftool-mergetool (2019-04-25) 6 commits
>  - difftool: fallback on merge.guitool
>  - difftool: make --gui, --tool and --extcmd mutually exclusive
>  - mergetool: fallback to tool when guitool unavailable
>  - mergetool: use get_merge_tool function
>  - t7610: add mergetool --gui tests
>  - t7610: unsuppress output
> 
>  Update "git difftool" and "git mergetool" so that the combinations
>  of {diff,merge}.{tool,guitool} configuration variables serve as
>  fallback settings of each other in a sensible order.
> 
>  Will merge to 'next'.

A reroll of this was sent at
<cover.1556518203.git.liu.denton@xxxxxxxxx> based on some comments that
David Aguilar made.

Thanks,

Denton