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

Re: Untracked working tree files

From
Nicolas Pitre <nico@cam.org>
Date
Oct 15, 2008, 19:32 UTC
Message-ID
<alpine.LFD.2.00.0810151531140.26244@xanadu.home>
In-Reply-To
<20081015122621.a9674d75.akpm@linux-foundation.org>
On Wed, 15 Oct 2008, Andrew Morton wrote:
Show 12 quoted lines
> I do
> 
> 	git-reset --hard HEAD
> 	git-reset --hard linux-next
> 	git-checkout linux-next
> 
> and get
> 
> error: Untracked working tree file 'Next/SHA1s' would be overwritten by merge.
> y
> 
> grr.
What about simply:
	git-checkout -f linux-next
Nicolas
Previous: Andrew MortonNext: Nicolas Pitre
Message 6 of 24 in “Untracked working tree files”
  1. Andrew MortonOct 15, 2008
  2. david@lang.hmOct 15, 2008
  3. david@lang.hmOct 15, 2008
  4. Andrew MortonOct 15, 2008
  5. Andrew MortonOct 15, 2008
  6. Nicolas PitreOct 15, 2008
  7. Nicolas PitreOct 15, 2008
  8. Linus TorvaldsOct 15, 2008
  9. david@lang.hmOct 15, 2008
  10. Linus TorvaldsOct 15, 2008
  11. david@lang.hmOct 15, 2008
  12. Andrew MortonOct 15, 2008
  13. Linus TorvaldsOct 15, 2008
  14. Andrew MortonOct 15, 2008
  15. Paolo CiarrocchiOct 16, 2008
  16. Andrew MortonOct 16, 2008
  17. Linus TorvaldsOct 15, 2008
  18. Andrew MortonOct 15, 2008
  19. Junio C HamanoOct 15, 2008
  20. reset --hard/read-tree --reset -u: remove unmerged new pathsJunio C Hamano, Oct 15, 2008
  21. Linus TorvaldsOct 15, 2008
  22. Junio C HamanoOct 16, 2008
  23. Ingo MolnarOct 16, 2008
  24. Junio C HamanoOct 16, 2008

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.