From: Junio C Hamano <gitster@pobox.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: git@vger.kernel.org, Jens Lehmann <jens.lehmann@web.de>,
Ronald Weiss <weiss.ronald@gmail.com>
Subject: Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)
Date: Thu, 03 Apr 2014 10:15:04 -0700 [thread overview]
Message-ID: <xmqqmwg2qqqv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140402200409.GA9984@sandbox-ub> (Heiko Voigt's message of "Wed, 2 Apr 2014 22:04:09 +0200")
Heiko Voigt <hvoigt@hvoigt.net> writes:
> On Mon, Mar 31, 2014 at 05:29:03PM -0700, Junio C Hamano wrote:
>> * hv/submodule-ignore-fix (2013-12-06) 4 commits
>> - disable complete ignorance of submodules for index <-> HEAD diff
>> - always show committed submodules in summary after commit
>> - teach add -f option for ignored submodules
>> - fix 'git add' to skip submodules configured as ignored
>>
>> Teach "git add" to be consistent with "git status" when changes to
>> submodules are set to be ignored, to avoid surprises after checking
>> with "git status" to see there isn't any change to be further added
>> and then see that "git add ." adds changes to them.
>>
>> I think a reroll is coming, so this may need to be replaced, but I
>> needed some practice with heavy conflict resolution. It conflicts
>> with two changes to "git add" that have been scheduled for Git 2.0
>> quite badly, and I think I got the resolution right this time.
>>
>> Waiting for a reroll.
>
> Since Ronald and Jens picked up this topic[1], I think you can discard
> my series.
Thanks, will do.
prev parent reply other threads:[~2014-04-03 17:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 0:29 What's cooking in git.git (Mar 2014, #08; Mon, 31) Junio C Hamano
2014-04-01 0:53 ` Duy Nguyen
2014-04-01 19:17 ` Junio C Hamano
2014-04-01 23:40 ` Duy Nguyen
2014-04-02 23:22 ` emacs buffer names Stephen Leake
2014-04-01 22:03 ` What's cooking in git.git (Mar 2014, #08; Mon, 31) Junio C Hamano
2014-04-02 5:05 ` David Kastrup
2014-04-02 19:41 ` Junio C Hamano
2014-04-02 20:04 ` Heiko Voigt
2014-04-03 17:15 ` Junio C Hamano [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=xmqqmwg2qqqv.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=jens.lehmann@web.de \
--cc=weiss.ronald@gmail.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).