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

Re: Now What?

From
Linus Torvalds <torvalds@osdl.org>
Date
Nov 3, 2005, 17:27 UTC
Message-ID
<Pine.LNX.4.64.0511030926020.27915@g5.osdl.org>
In-Reply-To
<Pine.LNX.4.64.0511031151070.25300@iabervon.org>
On Thu, 3 Nov 2005, Daniel Barkalow wrote:
Show 6 quoted lines
> 
> I think the situation is that he really wanted to update master, but 
> forgot that he was on the maint branch. So now he's in a merge of things 
> he didn't actually want to merge and wants to get back to not having junk 
> all over the place (some files that need to be merged, some files that 
> have been merged, new files, removed files, etc).

And that's exactly what "git reset --hard" is there for. It will reset to the old head of the branch you are on (ie HEAD), and get rid of everything that was done to the tree.

		Linus
Previous: Daniel BarkalowNext: Junio C Hamano
Message 9 of 20 in “Now What?”
  1. Jon LoeligerNov 3, 2005
  2. Chris ShoemakerNov 3, 2005
  3. Junio C HamanoNov 3, 2005
  4. Jon LoeligerNov 3, 2005
  5. Junio C HamanoNov 6, 2005
  6. Peter EriksenNov 3, 2005
  7. Junio C HamanoNov 3, 2005
  8. Daniel BarkalowNov 3, 2005
  9. Linus TorvaldsNov 3, 2005
  10. Junio C HamanoNov 3, 2005
  11. Peter EriksenNov 3, 2005
  12. Junio C HamanoNov 3, 2005
  13. Josef WeidendorferNov 3, 2005
  14. Daniel BarkalowNov 4, 2005
  15. Linus TorvaldsNov 3, 2005
  16. Junio C HamanoNov 3, 2005
  17. Junio C HamanoNov 3, 2005
  18. Josef WeidendorferNov 3, 2005
  19. Junio C HamanoNov 3, 2005
  20. Josef WeidendorferNov 3, 2005

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.