From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id E46AE20A10 for ; Fri, 29 Sep 2017 04:34:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751567AbdI2EeZ (ORCPT ); Fri, 29 Sep 2017 00:34:25 -0400 Received: from pb-sasl-trial3.pobox.com ([64.147.108.87]:52012 "EHLO pb-sasl-trial3.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbdI2EeX (ORCPT ); Fri, 29 Sep 2017 00:34:23 -0400 Received: from pb-sasl-trial3.pobox.com (localhost [127.0.0.1]) by pb-sasl-trial3.pobox.com (Postfix) with ESMTP id 1CDF42066B; Fri, 29 Sep 2017 00:34:20 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:mime-version:content-type; s=sasl; bh=9 LHig8dhxEFwzHXANRxZ6kZ95bE=; b=bOFpEOwsujW1HD/RBu0iCbOLWCbXy/Pth htONmK+4TiJUcsCJmXenqnA4bvbHGgQPkExrU9Esf0x2y/hsXJzLiL9sVR0v/sTa 86Nyx6CKtbQrVP3E/KnQiXTnZAiKSDv+9vpPSfNJDpsa9QRiTNzRma69Qdnr+wVW 7thAzWNcJw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:subject :date:message-id:mime-version:content-type; q=dns; s=sasl; b=RJt tCWShw/AOKmKrA4hbR1Cc3/ufP8qmmlLNHiqTp140KO+316NtdriRfrSen800L8g Kd9v3txYpdxaNIXVUX4/VunUJ/5yYxvKCjdAiyIkypC1X2K/nrGmOnmHd/L7C6HJ PzafxSaPYlIAIwUMcAiJxMeCgkrmsznEzptvOjsk= Received: from pb-smtp1.nyi.icgroup.com (pb-smtp1.pobox.com [10.90.30.53]) by pb-sasl-trial3.pobox.com (Postfix) with ESMTP id ECB812066A; Fri, 29 Sep 2017 00:34:19 -0400 (EDT) Received: from pobox.com (unknown [104.132.0.95]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 9EA04AFCC3; Fri, 29 Sep 2017 00:34:18 -0400 (EDT) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Sep 2017, #06; Fri, 29) X-master-at: ea220ee40cbb03a63ebad2be902057bf742492fd X-next-at: c088eec7b5eaefc58ab32b335cb69cb3d5e2cd78 Date: Fri, 29 Sep 2017 13:34:17 +0900 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 7510A11C-A4CF-11E7-824A-8EF31968708C-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- [Graduated to "master"] * hn/typofix (2017-09-22) 1 commit (merged to 'next' on 2017-09-25 at 489ad60f5b) + submodule.h: typofix * ic/fix-filter-branch-to-handle-tag-without-tagger (2017-09-22) 4 commits (merged to 'next' on 2017-09-25 at c7550033df) + filter-branch: use hash-object instead of mktag + filter-branch: stash away ref map in a branch + filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_* + filter-branch: reset $GIT_* before cleaning up "git filter-branch" cannot reproduce a history with a tag without the tagger field, which only ancient versions of Git allowed to be created. This has been corrected. * ik/userdiff-html-h-element-fix (2017-09-24) 1 commit (merged to 'next' on 2017-09-25 at e3cbe89672) + userdiff: fix HTML hunk header regexp The built-in pattern to detect the "function header" for HTML did not match

..

elements without any attributes, which has been fixed. * jc/merge-x-theirs-docfix (2017-09-25) 1 commit (merged to 'next' on 2017-09-26 at 5a7d954982) + merge-strategies: avoid implying that "-s theirs" exists The documentation for '-X