From: Jens Lehmann <Jens.Lehmann@web.de>
To: Nico -telmich- Schottelius <nico-linux-git@schottelius.org>
Cc: git@vger.kernel.org
Subject: Re: Changled submodule cannot be "git added"
Date: Tue, 15 Jun 2010 18:05:41 +0200 [thread overview]
Message-ID: <4C17A4D5.5040100@web.de> (raw)
In-Reply-To: <20100615073720.GB3260@schottelius.org>
Am 15.06.2010 09:37, schrieb Nico -telmich- Schottelius:
> Nico -telmich- Schottelius [Tue, Jun 15, 2010 at 09:25:14AM +0200]:
>> % git status
>> # modified: modules/tftpd_hpa (modified content)
>
> Ok, found out that I changed stuff within modules/tftpd_hpa, instead of
> merging from the source.
To make such surprises visible is the intent of showing "(modified
content)" here.
> Imho the git status output is a bit misleading, as I assume that
> I can git add stuff that's modified.
Maybe you just overlooked this line in the output of "git status":
"(commit or discard the untracked or modified content in submodules)"
> Regarding the other problem
>
>> - Why does git checkout not remove modules/ethz_systems_private/,
>> when switching from the master to the private branch?
>> (the module is only registered in the private branch)
>
> I'm still not sure what's the reason for that.
Because there might be stuff in there which is not tracked but you
might hate loosing by switching a branch.
prev parent reply other threads:[~2010-06-15 16:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-15 7:25 Changled submodule cannot be "git added" Nico -telmich- Schottelius
2010-06-15 7:37 ` Nico -telmich- Schottelius
2010-06-15 16:05 ` Jens Lehmann [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C17A4D5.5040100@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=nico-linux-git@schottelius.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.