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

Re: BUG: checkout won't checkout?

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 18, 2015, 22:28 UTC
Message-ID
<xmqq4mm4d53f.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CAE5ih7-=WPme_BxgAjtm9hrShxTk1z+uDM-LXzc3BcN3n2vqAg@mail.gmail.com>
Luke Diamand <luke@diamand.org> writes:
Show 11 quoted lines
> This is probably user error, but I'm not sure what I'm doing wrong.
> I'm posting here in case anyone else gets the same thing
>
> I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today.
>
> I've somehow ended up with history skipping back in time, but git not
> prepared to let let me fix it, or something.
>
> $ git diff upstream/master -- subtree
>  - lots of deltas, which look like I've reverted this back several
> revisions (which I haven't AFAIK)
Are you on the right branch that you think you are working on?
> $ git checkout upstream/master -- subtree
> $ git diff upstream/master -- subtree
> -- still lots of deltas

Does this show _ONLY_ additions? Or does it include modifications and removals?

Previous: Luke DiamandNext: Junio C Hamano
Message 3 of 7 in “BUG: checkout won't checkout?”
  1. Luke DiamandJun 18, 2015
  2. Luke DiamandJun 18, 2015
  3. Junio C HamanoJun 18, 2015
  4. Junio C HamanoJun 18, 2015
  5. Luke DiamandJun 18, 2015
  6. Junio C HamanoJun 18, 2015
  7. Luke DiamandJun 18, 2015

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.