[GRASS-dev] instructions to update my local copy of trunk

[Vaclav Petras]

On Sun, Jun 2, 2019 at 3:00 PM Veronica Andreo <veroandreo at gmail.com> wrote:

> Hi devs
>
> Following instructions here:
> https://trac.osgeo.org/grass/wiki/HowToGit#Keepyourlocalsourcecodeuptodate,
> I get:
>
> [veroandreo at localhost grass7_trunk]$ git remote -v
> origin git at github.com:veroandreo/grass.git (fetch)
> origin git at github.com:veroandreo/grass.git (push)
> upstream git at github.com:OSGeo/grass.git (fetch)
> upstream git at github.com:OSGeo/grass.git (push)
>
> [veroandreo at localhost grass7_trunk]$ git fetch upstream
> remote: Enumerating objects: 242, done.
> remote: Counting objects: 100% (242/242), done.
> remote: Compressing objects: 100% (25/25), done.
> remote: Total 296 (delta 223), reused 233 (delta 217), pack-reused 54
> Receiving objects: 100% (296/296), 56.83 KiB | 1.18 MiB/s, done.
> Resolving deltas: 100% (226/226), completed with 105 local objects.
> From github.com:OSGeo/grass
>  * [new branch]          changelog_fix_msg -> upstream/changelog_fix_msg
>    3797ccaaf..b300e66fc  master            -> upstream/master
>    1ca5e4e34..e1e13d782  releasebranch_7_4 -> upstream/releasebranch_7_4
>    15f53e803..dcfce280b  releasebranch_7_6 -> upstream/releasebranch_7_6
>
> [veroandreo at localhost grass7_trunk]$ git branch -a
> * master
>   remotes/origin/master
>   remotes/origin/releasebranch_7_0
>   remotes/origin/releasebranch_7_2
>   remotes/origin/releasebranch_7_4
>   remotes/origin/releasebranch_7_6
>   remotes/upstream/changelog_fix_msg
>   remotes/upstream/master
>   remotes/upstream/releasebranch_7_0
>   remotes/upstream/releasebranch_7_2
>   remotes/upstream/releasebranch_7_4
>   remotes/upstream/releasebranch_7_6
>
> [veroandreo at localhost grass7_trunk]$ git rebase upstream/master
> First, rewinding head to replay your work on top of it...
> Fast-forwarded master to upstream/master.
>
> [veroandreo at localhost grass7_trunk]$ git status
> On branch master
> Your branch is ahead of 'origin/master' by 51 commits.
>   (use "git push" to publish your local commits)
>
> Why does my origin/master is now ahead by 51 commits, if I have not a
> single local change? I just want to get the new stuff from upstream and
> update my fork and local copy of the source code (what I used to do with
> `svn update`).
>
>
Your branch 'master' is ahead of 'origin/master'. You need to push to
origin (something like `git push origin` but I think little different, Git
will tell you).

BTW, you can compare what you seen on GitHub with what you see locally, e.g.

git log --graph --abbrev-commit --pretty=oneline  --max-count=10
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/grass-dev/attachments/20190602/3204dfc0/attachment.html>