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

Re: I messed up my own git tree and I don't know how to fix it.

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Apr 21, 2019, 13:14 UTC
Message-ID
<87pnpfwlej.fsf@igel.home>
In-Reply-To
<cb1f725f-1314-d320-104a-726ef1c906fa@fastmail.com>
On Apr 20 2019, rob <drrob100@fastmail.com> wrote:
Show 7 quoted lines
> 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."
Previous: rob
Message 9 of 9 in “I messed up my own git tree and I don't know how to fix it.”
  1. robApr 21, 2019
  2. Adrian HApr 21, 2019
  3. robApr 21, 2019
  4. Philip OakleyApr 21, 2019
  5. robApr 21, 2019
  6. Philip OakleyApr 21, 2019
  7. robApr 21, 2019
  8. robApr 21, 2019
  9. Andreas SchwabApr 21, 2019

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.