freebsd-git-docs

freebsd-git-docs copied to clipboard

Extracting the original FreeBSD branch name when using a local branch?

2

I use a local branch to keep track of my own stuff, kernel configuration files and one firstboot script. When I ask Git which branch is checked out, I get...

Ximalas

fix typo

1

hushunchao

Probably 'main' here should be 'freebsd/main'?

2

Note that in my local setup, I also had to remove 'freebsd/' before 'master', but that is because I cloned the FreeBSD GitHub repo as a starting point.

rwatson

Fix remote name in "Migrating from GitHub fork"

2

The new FreeBSD repository no longer contains the old master branch so we can't use freebsd/master in the rebase command. Update the instructions to use origin for the GitHub remote.

arichardson

I think we patched subversion in FreeBSD to default to diff3 style conflicts instead of diff2. Git defaults to diff2, but can be changed to use diff3 via this snippet...

bsdjhb

vendor.md: suggest doc clarification/caveat around rsync

2

Thanks for drafting these documents; in general, the vendoring process has been more straightforward than our previous SVN system. One caveat I'd call out is the `rsync -va --del ~/git/NetBSD/usr.sbin/mtree/...

cemeyer

vendor.md: Annotated tags suggestion

1

Another suggestion for creating annotated tags. Current text: > It's also important to create an annotated tag, otherwise the push will be rejected. Only annotated tags are allowed to be...

cemeyer