git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 3, 2014, 17:15 UTC
Message-ID
<xmqqmwg2qqqv.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20140402200409.GA9984@sandbox-ub>
Heiko Voigt <hvoigt@hvoigt.net> writes:
Show 21 quoted lines
> 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.
Previous: Heiko Voigt
Message 10 of 10 in “What's cooking in git.git (Mar 2014, #08; Mon, 31)”
  1. Junio C HamanoApr 1, 2014
  2. Duy NguyenApr 1, 2014
  3. Junio C HamanoApr 1, 2014
  4. Duy NguyenApr 1, 2014
  5. Stephen LeakeApr 2, 2014
  6. Junio C HamanoApr 1, 2014
  7. David KastrupApr 2, 2014
  8. Junio C HamanoApr 2, 2014
  9. Heiko VoigtApr 2, 2014
  10. Junio C HamanoApr 3, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.