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

Re: bad git pull

From
MWMorten Welinder <mwelinder@gmail.com>
Date
Dec 17, 2005, 00:37 UTC
Message-ID
<118833cc0512161637v1d180f9fh66a7dc6d3fe11d2b@mail.gmail.com>
In-Reply-To
<Pine.LNX.4.64.0512161347490.3698@g5.osdl.org>
Show 11 quoted lines
>  - undo the last commit entirely ("hard reset to previous state"):
>
>         git reset --hard HEAD^
>
>    This was "bk undo"
>
>  - undo the last pull ("bk unpull"): "hard reset to ORIG_HEAD":
>
>         git reset --hard ORIG_HEAD
>
>    This was "bk unpull".

It would be outright peachy if Documentation/git-commit.txt and Documentation/git-pull.txt mentioned these. That is certainly where I would look first to answer the "what if I screwed up?" question.

Morten
Previous: Linus TorvaldsNext: Linus Torvalds
Message 11 of 22 in “bad git pull”
  1. Don ZickusDec 15, 2005
  2. Junio C HamanoDec 15, 2005
  3. Junio C HamanoDec 15, 2005
  4. Don ZickusDec 16, 2005
  5. Junio C HamanoDec 16, 2005
  6. Carl BaldwinDec 16, 2005
  7. Junio C HamanoDec 16, 2005
  8. Morten WelinderDec 16, 2005
  9. Junio C HamanoDec 16, 2005
  10. Linus TorvaldsDec 16, 2005
  11. Morten WelinderDec 17, 2005
  12. Linus TorvaldsDec 17, 2005
  13. Junio C HamanoDec 17, 2005
  14. Linus TorvaldsDec 17, 2005
  15. Junio C HamanoDec 17, 2005
  16. Nicolas PitreDec 17, 2005
  17. Junio C HamanoDec 18, 2005
  18. Nicolas PitreDec 18, 2005
  19. Linus TorvaldsDec 18, 2005
  20. Junio C HamanoDec 18, 2005
  21. Nicolas PitreDec 18, 2005
  22. Junio C HamanoDec 17, 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.