git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: highlights from next "What's cooking"
Date: Fri, 20 Jan 2012 16:13:03 -0800	[thread overview]
Message-ID: <7vvco5dib4.fsf@alter.siamese.dyndns.org> (raw)

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'.

                 reply	other threads:[~2012-01-21  0:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vvco5dib4.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    /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.
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 NNTP newsgroup(s).