On Sun, Dec 09, 2018 at 05:42:27PM +0900, Junio C Hamano wrote: > * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits > (merged to 'next' on 2018-11-21 at 217be06acb) > + 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. > > Will cook in 'next'. >From our discussion[1], expect a reroll with the ability to do scissors cleanup in messages generated by git-merge. Unfortunately, it'll be a couple of weeks because of finals season. > > * dl/remote-save-to-push (2018-11-13) 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. Any way I could convince you otherwise? I guess this could be rolled into a helper script but it'd be very useful to have the behaviour standardised into the actual remote builtin. [1]: https://public-inbox.org/git/xmqqin0n44dv.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx/
