From: Andreas Schwab <schwab@linux-m68k.org>
To: rob <drrob100@fastmail.com>
Cc: git@vger.kernel.org, rob@drrob1.com
Subject: Re: I messed up my own git tree and I don't know how to fix it.
Date: Sun, 21 Apr 2019 15:14:12 +0200 [thread overview]
Message-ID: <87pnpfwlej.fsf@igel.home> (raw)
In-Reply-To: <cb1f725f-1314-d320-104a-726ef1c906fa@fastmail.com> (rob's message of "Sat, 20 Apr 2019 23:01:08 -0400")
On Apr 20 2019, rob <drrob100@fastmail.com> wrote:
> changes not staged for commit:
>
> modified: github.com/alecthomas/gometalinter (modified content)
>
> modified: github.com/kisielk/errcheck (modified content)
>
> modified: github.com/rogpeppe/godef (modified content)
You have submodules with modified content. If you want to keep them you
need to create commits in each modified submodule, then add them to the
superproject and commit there.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
prev parent reply other threads:[~2019-04-21 13:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-21 3:01 I messed up my own git tree and I don't know how to fix it rob
2019-04-21 5:03 ` Adrian H
2019-04-21 12:34 ` rob
2019-04-21 13:03 ` Philip Oakley
2019-04-21 17:07 ` rob
2019-04-21 17:22 ` Philip Oakley
2019-04-21 18:53 ` rob
2019-04-21 21:18 ` rob
2019-04-21 13:14 ` Andreas Schwab [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=87pnpfwlej.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=drrob100@fastmail.com \
--cc=git@vger.kernel.org \
--cc=rob@drrob1.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.
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).