Fetching from peer's public repo

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



My fetch from a peer's public repo seems to be failing:

% git --bare fetch git://source/public/project topic:topic
remote: Generating pack...
remote: Done counting 48 objects.
remote: Result has 34 objects.
remote: Deltifying 34 objects.
remote:  100% (34/34) done
remote: Total 34, written 34 (delta 22), reused 24 (delta 12)
Unpacking 34 objects
 100% (34/34) done
* refs/heads/topic: not updating to non-fast forward branch 'topic' of git://source/public/project
  old...new: 1c332f5...f3b18ff

I assume that is because his public repo does not contain changes I
have pushed into my public repo.  So, I asked him to pull from
my public repo into his.  He did, and said that git blathered that
there were 12 changed files, etc.

I then tried the fetch again and it failed in the same way.  If I
look at the log output for the "old...new: 1c332f5...f3b18ff" line
above, I see the changes that he has that I want to get, but apparently
cannot (I tried to pull from my public to my private and it said
"Already up-to-date."):

% git log 1c332f5..f3b18ff
[... output looks reasonable ...]

Any ideas on how I can resolve this?

Also, what is the difference between:

% git log 1c332f5..f3b18ff

and

% git log 1c332f5...f3b18ff

with the latter having three dots instead of two?  It seems to show
much more output, but I don't know what the intent is.


Bill
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]