Hi Junio,
On Mon, 24 Jul 2017, Junio C Hamano wrote:
> * js/blame-lib (2017-07-24) 1 commit
> - blame: fix memory corruption scrambling revision name in error message
>
> A hotfix to a topic already in 'master'.
>
> Will merge to 'next'.
This sounds more critical than `next`, in particular since you said that
you do not want to move anything from `next` to `master` before 2.14
final.
> * js/rebase-i-final (2017-06-15) 10 commits
> - rebase -i: rearrange fixup/squash lines using the rebase--helper
> - t3415: test fixup with wrapped oneline
> - rebase -i: skip unnecessary picks using the rebase--helper
> - rebase -i: check for missing commits in the rebase--helper
> - t3404: relax rebase.missingCommitsCheck tests
> - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
> - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
> - rebase -i: remove useless indentation
> - rebase -i: generate the script via rebase--helper
> - t3415: verify that an empty instructionFormat is handled as before
>
> The final batch to "git rebase -i" updates to move more code from
> the shell script to C.
>
> Expecting a reroll.
Since you said yourself that you won't pick up v6 (even if I made clear
that I have a strong preference for resolving merge conflicts myself
rather than have you guess), it may be a good idea to change this from
"Expecting a reroll" to something else?
> * jc/http-sslkey-and-ssl-cert-are-paths (2017-07-20) 1 commit
> (merged to 'next' on 2017-07-20 at 5489304b99)
> + http.c: http.sslcert and http.sslkey are both pathnames
>
> The http.{sslkey,sslCert} configuration variables are to be
> interpreted as a pathname that honors "~[username]/" prefix, but
> weren't, which has been fixed.
>
> Will cook in 'next'.
Just so you know: an identical patch has been cooking in Git for Windows
as 26b08ecec8d37b976be9e85055a0a9e3d16a56da since Dec 11 2015.
> * wd/rebase-conflict-guide (2017-07-17) 1 commit
> (merged to 'next' on 2017-07-20 at c78e758b23)
> + rebase: make resolve message clearer for inexperienced users
>
> Code clean-up.
This is not a code clean-up. It is an improvement of the user experience.
Ciao,
Dscho
P.S.: Sorry for not branching off of the thread with proper "<branch>,
was: What's cooking" subjects, but I am seriously short on time. Please
accept my apologies.
