Re: What's cooking in git.git (Jan 2019, #02; Tue, 15)

[Denton Liu <liu.denton@gmail.com>]

On Tue, Jan 15, 2019 at 02:31:06PM -0800, Junio C Hamano wrote:
> * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits
>  - merge: add scissors line on merge conflict
>  - t7600: clean up 'merge --squash c3 with c7' test
> 
>  The list of conflicted paths shown in the editor while concluding a
>  conflicted merge was shown above the scissors line when the
>  clean-up mode is set to "scissors", even though it was commented
>  out just like the list of updated paths and other information to
>  help the user explain the merge better.
> 
>  Ready?

The current patch should be kicked out in favour of the new revision,
v5 [1]. It hasn't been reviewed yet, though, so I expect some revisions
before it's finalised.

> * dl/remote-save-to-push (2018-12-11) 1 commit
>  - remote: add --save-to-push option to git remote set-url
> 
>  "git remote set-url" learned a new option that moves existing value
>  of the URL field to pushURL field of the remote before replacing
>  the URL field with a new value.
> 
>  I am personally not yet quite convinced if this is worth pursuing.

After our discussion here[2], I resubmitted a new patch describing the
use-case of the feature. I was just wondering you're still "not quite
convinced" or if the description was just outdated.

Thanks!

-Denton

[1]: https://public-inbox.org/git/cover.1545745331.git.liu.denton@gmail.com/
[2]: https://public-inbox.org/git/xmqqtvjlisnu.fsf@gitster-ct.c.googlers.com/