From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2015, #03; Fri, 10)
Date: Sat, 11 Jul 2015 10:45:44 +0200 [thread overview]
Message-ID: <b7df3f32811a3e729c9ffda3729f4707@www.dscho.org> (raw)
In-Reply-To: <xmqqh9pbk4y5.fsf@gitster.dls.corp.google.com>
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
prev parent reply other threads:[~2015-07-11 8:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 22:45 What's cooking in git.git (Jul 2015, #03; Fri, 10) Junio C Hamano
2015-07-10 22:58 ` Eric Sunshine
2015-07-12 16:38 ` Junio C Hamano
2015-07-11 8:45 ` Johannes Schindelin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b7df3f32811a3e729c9ffda3729f4707@www.dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).