Where can I find the new git repository?
steve at sohara.org
Sat Dec 26 11:33:04 UTC 2020
On Sat, 26 Dec 2020 12:00:57 +0100
Matthias Apitz <guru at unixarea.de> wrote:
> $ cd freebsd-src
> $ git diff
> It does not show any diffs against the upstream head. I think, it does
> not go even to Internet with this command. If I locally modify a file,
> the diff is shown.
Yep that is how git works it is a distributed version control
system so diff is between your checked out copy and the branch in your
repository. The basic interactions with remote repositories are just fetch
To collect changes from upstream use git fetch to fetch them
and integrate them into your local branch use git pull (which combines a
fetch and merge into your local repository).
After a fetch you can compare what has been fetched with your
local branch (git diff origin:<branch> or git diff FETCH_HEAD) before
merging the changes in if you wish.
I prefer to keep my copies of upstream branches pristine and create
branches off them to do my work in. That way when I pull it's always just a
fast forward and I get to deal with any conflicts in the working branch(es)
when I rebase them. Also it makes it easy to separate multiple streams of
work. Branching in git is extremely cheap and so just as ZFS encourages
free use of filesystem boundaries git encourages free use of branching.
Steve O'Hara-Smith <steve at sohara.org>
More information about the freebsd-questions