From: Pratyush Yadav <firstname.lastname@example.org>
To: Stefanie Leisestreichler <email@example.com>
Cc: git <firstname.lastname@example.org>
Subject: Re: Git diff|status against remote repo
Date: Mon, 16 Sep 2019 16:15:05 +0530 [thread overview]
Message-ID: <email@example.com> (raw)
On 16/09/19 11:02AM, Stefanie Leisestreichler wrote:
> I am far from being a pro in git.
> There is something I do not understand.
> This is my git config:
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
> [remote "origin"]
> url = ssh://firstname.lastname@example.org:/home/git/PROJECT.git
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> remote = origin
> merge = refs/heads/master
> [branch "develop"]
> remote = origin
> merge = refs/heads/develop
> I have a local repo called "develop" also on each involved dev machine.
> Developer A has made changes on nearly each file of the project by changing
> the namespace and locally commited those changes to his local branch
> "develop". After that he did a git push.
> On a not involved machine M I did a git clone
> ssh://email@example.com:/home/git/PROJECT.git and after that I did a "git
> checkout develop" which was followed by a message like "Branch develop is
> following remote branch develop from origin". I can see all the changes
> Developer A has made.
> On my machine DEV I am on my local branch develop. Since I did not pull or
> merge from origin already, I am not able to see any of those changes
> developer A has made. So far so good. But I would expect, that git status
> (which results in "On branch develop. Your branch is up to date with
> origin/develop) or "git diff origin/develop develop" or "git diff
> origin/develop...develop" (both no output at all) would give me a hint that
> I am x commits behind origin/master or (git diff) will show me the changes
> Developer A committed to the Repro. But nothing...
> What am I doing wrong?
You haven't gotten the new commits from origin, so your local repo can't
know how ahead/behind it is from its remote version.
Run `git fetch origin`.
Now if you run `git status`, it should show you that you are X commits
`git pull` does two things: `git fetch` and `git merge`. fetch
"downloads" all the commits from remote, and merge then puts them in
your local branch. So if you do a `git pull`, developer A's changes are
now merged into your tree. But if you only do a fetch, origin/master
gets updated, but not your local master. So now status can know how far
you are behind, but your local branch is not changed yet.
Once you are ready to finally get those changes in your local branch,
run `git merge origin/master`.
next prev parent reply other threads:[~2019-09-16 10:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 9:02 Git diff|status against remote repo Stefanie Leisestreichler
2019-09-16 10:45 ` Pratyush Yadav [this message]
2019-09-16 11:31 ` Stefanie Leisestreichler
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:
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 \
* 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
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).