Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| ports:gitquickstart [2021/04/06 13:54] – JurajLutter | ports:gitquickstart [2021/04/15 07:04] (current) – don't suggest installing all conflicting git flavors at the same time TobiasKortkamp | ||
|---|---|---|---|
| Line 3: | Line 3: | ||
| This page is to capture issues raised on IRC by other committers and users, so | This page is to capture issues raised on IRC by other committers and users, so | ||
| we don't lose that info while it gets added to official documentation. The | we don't lose that info while it gets added to official documentation. The | ||
| - | steps here should mirror the more detailed instructions at the below url: | + | steps here should mirror the more detailed instructions at the below URL: |
| - | - https:// | + | * https:// |
| ====== Quick Start ====== | ====== Quick Start ====== | ||
| + | |||
| + | ===== Getting a git client ===== | ||
| + | |||
| + | The simplest way to get started with git, today, is to install git from the | ||
| + | pre-packaged %%FreeBSD%% packages, or to build the same package yourself in the | ||
| + | usual fashion: | ||
| + | |||
| + | * the smallest package with least dependencies: | ||
| + | |||
| + | < | ||
| + | # pkg install -r FreeBSD git-lite | ||
| + | </ | ||
| + | |||
| + | * the full blown git experience with many dependencies: | ||
| + | |||
| + | < | ||
| + | # pkg install -r FreeBSD git | ||
| + | </ | ||
| + | |||
| + | * install from source build | ||
| + | |||
| + | < | ||
| + | # cd / | ||
| + | </ | ||
| + | |||
| + | You're now ready to go. | ||
| ===== Getting the Repo ===== | ===== Getting the Repo ===== | ||
| Line 30: | Line 56: | ||
| # last fetch, and your attempted push. | # last fetch, and your attempted push. | ||
| git config pull.rebase true | git config pull.rebase true | ||
| + | # fetch the prepare-commit-msg hook | ||
| + | fetch https:// | ||
| + | chmod +x .git/ | ||
| + | |||
| </ | </ | ||
| Line 66: | Line 96: | ||
| [user] | [user] | ||
| # these entries came from ssh you@freefall gen-gitconfig.sh | # these entries came from ssh you@freefall gen-gitconfig.sh | ||
| - | name = A Committer | + | name = " |
| - | email = you@FreeBSD.org | + | email = "you@FreeBSD.org" |
| </ | </ | ||
| Line 236: | Line 266: | ||
| < | < | ||
| - | cat/ | + | cat/ |
| - fixes the foobinator | - fixes the foobinator | ||
| Line 289: | Line 319: | ||
| < | < | ||
| $ git log --oneline | $ git log --oneline | ||
| - | e7edeb6d7cb7 (HEAD -> main) cat/ | + | e7edeb6d7cb7 (HEAD -> main) cat/ |
| ab8a59366f5a (freebsd/ | ab8a59366f5a (freebsd/ | ||
| bafa49e87ea9 update check_ssl_cert to 2.0.0 | bafa49e87ea9 update check_ssl_cert to 2.0.0 | ||
| Line 376: | Line 406: | ||
| Date: Tue Apr 6 12:31:02 2021 +0000 | Date: Tue Apr 6 12:31:02 2021 +0000 | ||
| - | cat/ | + | cat/ |
| </ | </ | ||
| Line 395: | Line 425: | ||
| Your branch is up to date with ' | Your branch is up to date with ' | ||
| - | $ git remove | + | $ git remote |
| freebsd https:// | freebsd https:// | ||
| freebsd ssh:// | freebsd ssh:// | ||
| - | * main | + | * main |
| - | my-ports-changes f190fc172c79 cat/ | + | my-ports-changes f190fc172c79 cat/ |
| $ git pull --ff-only freebsd main | $ git pull --ff-only freebsd main | ||
| Line 417: | Line 447: | ||
| ===== Tips ===== | ===== Tips ===== | ||
| - | * commit messages should be similar to '' | + | * commit messages should be similar to '' |
| ===== Common Problems ===== | ===== Common Problems ===== | ||
| Line 467: | Line 497: | ||
| and the repository exists. | and the repository exists. | ||
| </ | </ | ||
| - | |||
| - | ---- | ||
| ---- | ---- | ||