From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: highlights from next "What's cooking" Date: Fri, 20 Jan 2012 16:13:03 -0800 Message-ID: <7vvco5dib4.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jan 21 01:13:17 2012 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RoOa0-0002Gl-JL for gcvg-git-2@lo.gmane.org; Sat, 21 Jan 2012 01:13:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756657Ab2AUANI (ORCPT ); Fri, 20 Jan 2012 19:13:08 -0500 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:44112 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756553Ab2AUANF (ORCPT ); Fri, 20 Jan 2012 19:13:05 -0500 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 1BB8D7812; Fri, 20 Jan 2012 19:13:05 -0500 (EST) 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=D HJe5xQmBEEaCQPOfeSjNCL/Vv0=; b=LMKDOYf75zt29CfDBh4QLtvREflJr7I1E FyrcweZBydU7/Px7rKJhRfCXNZdFvYpFjFT+RvPZs5oG+H8OLrn/3NA+KclWlkm3 E+r6dBtQPWwitK62DHuMlMWu5zH7pR83Qi1w+eGc7jjr1uMksx2AHS/ihhx7LHd3 4BQ4atPNJ8= 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=stn mpa5dlhp5Es0jM9+zvaJAaLRn5CRGBEnhw3kQBEPelT2Av3evzHFifgvnfbeQxxA R7B5IEYUsyRgDu0LdzLKr0Lts0clWOhYhItAYHhNc9P61HFcBFLvfweaCSwByj8E Vv+eLA7y97cTwlB2yFiGyKszoXc6vaA5QhERMZ5Q= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 13E047811; Fri, 20 Jan 2012 19:13:05 -0500 (EST) Received: from pobox.com (unknown [76.102.170.102]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 9C9C5780E; Fri, 20 Jan 2012 19:13:04 -0500 (EST) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: B0318EFE-43C4-11E1-8DC7-9DB42E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: These have been merged for upcoming 1.7.9 recently: * jc/pull-signed-tag-doc (2012-01-17) 1 commit + pulling signed tag: add howto document * mh/maint-show-ref-doc (2012-01-13) 2 commits (merged to 'next' on 2012-01-16 at 8573f09) + git-show-ref doc: typeset regexp in fixed width font + git-show-ref: fix escaping in asciidoc source * nd/pathspec-recursion-cleanup (2012-01-16) 2 commits (merged to 'next' on 2012-01-16 at 0189264) + diff-index: enable recursive pathspec matching in unpack_trees + Document limited recursion pathspec matching with wildcards * tr/maint-word-diff-incomplete-line (2012-01-12) 1 commit (merged to 'next' on 2012-01-16 at 58ddaaf) + word-diff: ignore '\ No newline at eof' marker * jk/credentials (2012-01-16) 4 commits (merged to 'next' on 2012-01-16 at 2810b82) + credential-cache: ignore "connection refused" errors (merged to 'next' on 2012-01-16 at 1c6c94a) + unix-socket: do not let close() or chdir() clobber errno during cleanup + credential-cache: report more daemon connection errors + unix-socket: handle long socket pathnames Also I updated the jc/pull-signed-tag topic that follows Linus's suggestion to always spawn an editor when running "git merge" in an interactive session. The special-case environment variable has been renamed to MERGE_AUTOEDIT, and scripts can set it to "no" when they start to accept the autogenerated merge log message. There is no plan to encourage humans to keep using the historical behaviour, hence there is no support for configuration variable (e.g. merge.autoedit) that can be set to 'no'.