[git-users] Re: Your branch is ahead of 'origin/main' by … commits: how to 'reset' things?

2023-06-11 Thread Graham Perrin 
… although, my GitHub repo was synchronised with the FreeBSD repo at the 
outset, so: 

   - I don't understand how the pull from GitHub had an end result that 
   differed from `pull freebsd main`. 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/4dbf588c-94a7-4473-92b2-ec1b2a26dee6n%40googlegroups.com.

[git-users] Re: Your branch is ahead of 'origin/main' by … commits: how to 'reset' things?

2023-06-11 Thread Graham Perrin 
I was over-thinking. Resolved with a simple pull. 

% git -C /usr/src pull freebsd main 
>From https://git.freebsd.org/src 
* branch  main   -> FETCH_HEAD 
Already up to date. 
% git -C /usr/src pull  
remote: Enumerating objects: 118, done. 
remote: Counting objects: 100% (92/92), done. 
remote: Compressing objects: 100% (8/8), done. 
remote: Total 118 (delta 84), reused 88 (delta 84), pack-reused 26 
Receiving objects: 100% (118/118), 29.13 KiB | 233.00 KiB/s, done. 
Resolving deltas: 100% (92/92), completed with 16 local objects. 
>From https://github.com/grahamperrin/freebsd-src 
  6062d9faf23f..bb5d6d14d81b  main   -> origin/main 
  f2c8a778ca94..37e2a11f25f4  bug-261349 -> origin/bug-261349 
  eb6e41c32e5b..2a5324685d3a  stable/12  -> origin/stable/12 
Already up to date. 
% git -C /usr/src status 
On branch main 
Your branch is up to date with 'origin/main'. 

nothing to commit, working tree clean 
% 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/274a6556-635e-421e-b9f0-ec13412cae4an%40googlegroups.com.