Hi Junio, On 2015-07-11 00:45, Junio C Hamano wrote: > * et/http-proxyauth (2015-06-29) 1 commit > (merged to 'next' on 2015-07-09 at cf80874) > + http: always use any proxy auth method available > > We used to ask libCURL to use the most secure authentication method > available when talking to an HTTP proxy only when we were told to > talk to one via configuration variables. We now ask libCURL to > always use the most secure authentication method, because the user > can tell libCURL to use an HTTP proxy via an environment variable > without using configuration variables. > > An extra set of eyes appreciated, but I think this is ready. I believe so, yes, and I further believe that this would also have helped a Git for Windows user: https://github.com/git-for-windows/git/issues/234 Therefore, I am very much in favor of merging this to 'master'. > * jc/fsck-retire-require-eoh (2015-06-28) 1 commit > (merged to 'next' on 2015-07-09 at dbc292b) > + fsck: it is OK for a tag and a commit to lack the body > > A fix to a minor regression to "git fsck" in v2.2 era that started > complaining about a body-less tag object when it lacks a separator > empty line after its header to separate it with a non-existent body. Thanks for cleaning up after me! > * pt/pull-builtin (2015-06-18) 19 commits > (merged to 'next' on 2015-07-10 at 07b1794) > + pull: remove redirection to git-pull.sh > + pull --rebase: error on no merge candidate cases > + pull --rebase: exit early when the working directory is dirty > + pull: configure --rebase via branch.<name>.rebase or pull.rebase > + pull: teach git pull about --rebase > + pull: set reflog message > + pull: implement pulling into an unborn branch > + pull: fast-forward working tree if head is updated > + pull: check if in unresolved merge state > + pull: support pull.ff config > + pull: error on no merge candidates > + pull: pass git-fetch's options to git-fetch > + pull: pass git-merge's options to git-merge > + pull: pass verbosity, --progress flags to fetch and merge > + pull: implement fetch + merge > + pull: implement skeletal builtin pull > + argv-array: implement argv_array_pushv() > + parse-options-cb: implement parse_opt_passthru_argv() > + parse-options-cb: implement parse_opt_passthru() > (this branch is used by pt/am-builtin.) > > Reimplement 'git pull' in C. > > Will merge to 'master'. Yeah! Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html