On Wed, Nov 07 2018, Junio C Hamano wrote: > * ab/range-diff-no-patch (2018-11-07) 1 commit > - range-diff: add a --no-patch option to show a summary > > "range-diff" learns the "--no-patch" option, which can be used to > get a high-level overview without the actual line-by-line patch > difference shown. > > Will merge to 'next'. Per <20181107122202.1813-1-avarab@xxxxxxxxx> it turns out this whole thing should have been a bugfix instead, sent a v2. > * ab/dynamic-gettext-poison (2018-11-02) 1 commit > - i18n: make GETTEXT_POISON a runtime option > > On hold. > cf. <20181102163725.GY30222@xxxxxxxxxx> Hope to sent update soon... > * ab/push-dwim-dst (2018-10-29) 9 commits > - SQUASH??? > - push doc: document the DWYM behavior pushing to unqualified <dst> > - push: add DWYM support for "git push refs/remotes/...:<dst>" > - push: test that <src> doesn't DWYM if <dst> is unqualified > - push: add an advice on unqualified <dst> push > - push: move unqualified refname error into a function > - push: improve the error shown on unqualified <dst> push > - i18n: remote.c: mark error(...) messages for translation > - remote.c: add braces in anticipation of a follow-up change > > "git push $there $src:$dst" rejects when $dst is not a fully > qualified refname and not clear what the end user meant. The > codepath has been taught to give a clearer error message, and also > guess where the push should go by taking the type of the pushed > object into account (e.g. a tag object would want to go under > refs/tags/). > > The last few steps are questionable. > cf. <87in1lkw54.fsf@xxxxxxxxxxxxxxxxxxx> ...ditto... > * ab/pack-tests-cleanup (2018-10-31) 3 commits > (merged to 'next' on 2018-11-03 at b4a39595bb) > + index-pack tests: don't leave test repo dirty at end > + pack-objects tests: don't leave test .git corrupt at end > + pack-objects test: modernize style > > A couple of tests used to leave the repository in a state that is > deliberately corrupt, which have been corrected. > > Will merge to 'master'. Thanks! > * nd/config-split (2018-10-29) 79 commits > (merged to 'next' on 2018-11-03 at a336559101) > + config.txt: remove config/dummy.txt > + config.txt: move worktree.* to a separate file > + config.txt: move web.* to a separate file > + config.txt: move versionsort.* to a separate file > + config.txt: move user.* to a separate file > + config.txt: move url.* to a separate file > + config.txt: move uploadpack.* to a separate file > + config.txt: move uploadarchive.* to a separate file > + config.txt: move transfer.* to a separate file > + config.txt: move tag.* to a separate file > + config.txt: move submodule.* to a separate file > + config.txt: move stash.* to a separate file > + config.txt: move status.* to a separate file > + config.txt: move splitIndex.* to a separate file > + config.txt: move showBranch.* to a separate file > + config.txt: move sequencer.* to a separate file > + config.txt: move sendemail-config.txt to config/ > + config.txt: move reset.* to a separate file > + config.txt: move rerere.* to a separate file > + config.txt: move repack.* to a separate file > + config.txt: move remotes.* to a separate file > + config.txt: move remote.* to a separate file > + config.txt: move receive-config.txt to config/ > + config.txt: move rebase-config.txt to config/ > + config.txt: move push-config.txt to config/ > + config.txt: move pull-config.txt to config/ > + config.txt: move protocol.* to a separate file > + config.txt: move pretty.* to a separate file > + config.txt: move pager.* to a separate file > + config.txt: move pack.* to a separate file > + config.txt: move notes.* to a separate file > + config.txt: move mergetool.* to a separate file > + config.txt: move merge-config.txt to config/ > + config.txt: move man.* to a separate file > + config.txt: move mailmap.* to a separate file > + config.txt: move mailinfo.* to a separate file > + config.txt: move log.* to a separate file > + config.txt: move interactive.* to a separate file > + config.txt: move instaweb.* to a separate file > + config.txt: move init.* to a separate file > + config.txt: move index.* to a separate file > + git-imap-send.txt: move imap.* to a separate file > + config.txt: move i18n.* to a separate file > + config.txt: move http.* to a separate file > + config.txt: move ssh.* to a separate file > + config.txt: move help.* to a separate file > + config.txt: move guitool.* to a separate file > + config.txt: move gui-config.txt to config/ > + config.txt: move gpg.* to a separate file > + config.txt: move grep.* to a separate file > + config.txt: move gitweb.* to a separate file > + config.txt: move gitcvs-config.txt to config/ > + config.txt: move gc.* to a separate file > + config.txt: move fsck.* to a separate file > + config.txt: move fmt-merge-msg-config.txt to config/ > + config.txt: move format-config.txt to config/ > + config.txt: move filter.* to a separate file > + config.txt: move fetch-config.txt to config/ > + config.txt: move fastimport.* to a separate file > + config.txt: move difftool.* to a separate file > + config.txt: move diff-config.txt to config/ > + config.txt: move completion.* to a separate file > + config.txt: move credential.* to a separate file > + config.txt: move commit.* to a separate file > + config.txt: move column.* to a separate file > + config.txt: move color.* to a separate file > + config.txt: move clean.* to a separate file > + config.txt: move checkout.* to a separate file > + config.txt: move browser.* to a separate file > + config.txt: move branch.* to a separate file > + config.txt: move blame.* to a separate file > + config.txt: move apply.* to a separate file > + config.txt: move am.* to a separate file > + config.txt: move alias.* to a separate file > + config.txt: move add.* to a separate file > + config.txt: move core.* to a separate file > + config.txt: move advice.* to a separate file > + Update makefile in preparation for Documentation/config/*.txt > + Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split > (this branch uses bp/reset-quiet.) > > Split the overly large Documentation/config.txt file into million > little pieces. This potentially allows each individual piece > included into the manual page of the command it affects more easily. > > Will merge to 'master'. > > This is a painful conversions while many other topics in flight > wants to add to or edit the documentation of configuration > variables. Yeah the sooner this lands in master the better. I stopped deploying internal versions of git while this is in flight. Having topics I want to apply (based off master) + deploying next + resolving conflicts was too painful to bother with.
