git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ed Greenberg <edg@greenberg.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Problem with two copies of same branch diverging
Date: Thu, 4 Aug 2016 10:57:28 -0700	[thread overview]
Message-ID: <CAPc5daU7cyUNYOPbg1cYrkvCzYZ9xCsx4MhSZRHaeoXy9Ltcrg@mail.gmail.com> (raw)
In-Reply-To: <36ecaea6-5f09-25fd-ffa7-61bdaf91414d@greenberg.org>

On Thu, Aug 4, 2016 at 10:50 AM, Ed Greenberg <edg@greenberg.org> wrote:
> On 08/04/2016 01:28 PM, Junio C Hamano wrote:
>>
>> ... indicates that you are not pushing to update the remote
>> repository correctly.  Once you get that part working correctly,
>> after you push at the end of the session, you should be able to do
>> "git reset" at the other side to tell Git to notice that the updated
>> working tree files that were transferred behind its back are now in
>> sync with what is supposed to be checked out.
>
> If this is the case, why do my fresh clones contain the most recent commit?

Exactly. Why does your "push" not result in "git log" to show the
most recent commit? Once you solve that, "git reset" would do
the right thing, I would think, just like a fresh clone shows the
latest.  The thing is, that I didn't quite find out what your "push"
is doing wrong in your original message.

      parent reply	other threads:[~2016-08-04 17:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-04 15:08 Problem with two copies of same branch diverging Ed Greenberg
2016-08-04 17:28 ` Junio C Hamano
     [not found]   ` <36ecaea6-5f09-25fd-ffa7-61bdaf91414d@greenberg.org>
2016-08-04 17:57     ` Junio C Hamano [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAPc5daU7cyUNYOPbg1cYrkvCzYZ9xCsx4MhSZRHaeoXy9Ltcrg@mail.gmail.com \
    --to=gitster@pobox.com \
    --cc=edg@greenberg.org \
    --cc=git@vger.kernel.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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).