From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
Cc: Git Users <git@vger.kernel.org>
Subject: Re: BUG: checkout won't checkout?
Date: Thu, 18 Jun 2015 15:28:04 -0700 [thread overview]
Message-ID: <xmqq4mm4d53f.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAE5ih7-=WPme_BxgAjtm9hrShxTk1z+uDM-LXzc3BcN3n2vqAg@mail.gmail.com> (Luke Diamand's message of "Thu, 18 Jun 2015 23:07:18 +0100")
Luke Diamand <luke@diamand.org> writes:
> 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?
next prev parent reply other threads:[~2015-06-18 22:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 22:07 BUG: checkout won't checkout? Luke Diamand
2015-06-18 22:13 ` Luke Diamand
2015-06-18 22:28 ` Junio C Hamano [this message]
2015-06-18 22:32 ` Junio C Hamano
2015-06-18 22:47 ` Luke Diamand
2015-06-18 22:53 ` Junio C Hamano
2015-06-18 22:56 ` Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4mm4d53f.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.