lk/data/git.md

161 lines
3.3 KiB
Markdown
Raw Normal View History

2022-01-16 18:20:39 +00:00
---
title: "git"
tags: [ "Documentation", "data" ]
---
2020-01-02 03:12:18 +00:00
# Starting
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
## New Machines
2020-01-02 00:04:35 +00:00
2022-05-16 22:23:53 +00:00
> git config --global user.email *"malinfreeborn@posteo.net"*
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git config --global user.name *"Malin Freeborn"*
2020-01-02 00:04:35 +00:00
2022-01-26 22:35:07 +00:00
# New Git
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
Start a git in a folder:
> mkdir *project* && cd *project*
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
> git init
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
Make a file explaining what the project does:
> vim README.md
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git add README.md
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
Then make the initial commit, explaining the change you just made:
2020-01-02 00:04:35 +00:00
> git commit
2020-01-02 03:12:18 +00:00
# Working
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
Once you make a change to some file ("file.sh"), add it and make a commit explaining it.
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
> git add file.sh
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
> git commit -m"change file.sh"
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
Check your history:
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
> git log
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
# Remotes
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
If you want to keep a copy on a public site such as Gitlab, so others can see it, then go there and create a blank project (no readme, nothing).
Find the address you want and add it as a remote:
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git remote add *gitlab* *https://gitlab.com/username/projectx*
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
Tell git you're pushing the branch "master" to the remote repo "origin":
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
> git push -u master origin
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
If someone makes a change on the remote, pull it down with:
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
> git pull
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
# Branches
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
A branch is a full copy of the project to test additional ideas.
You can make a new branch called 'featurez' like this:
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git branch *featurez*
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
Have a look at all your branches:
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
> git branch
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
Switch to your new branch:
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git checkout *featurez*
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
And if your changes are rubbish, checkout the "master" branch again, then delete "featurez":
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git branch -D *featurez*
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
Or if it's a good branch, push it to the remote:
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git push *origin* *featurez*
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
## Merging
2020-01-02 00:04:35 +00:00
2020-01-02 03:12:18 +00:00
Once you like the feature, merge it into the main branch. Switch to master then merge it:
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
> git merge *featurez*
2020-01-02 00:04:35 +00:00
2022-02-03 19:01:44 +00:00
and delete `featurez` as you've already merged it:
2020-02-26 09:31:17 +00:00
> git branch -d featurez
2020-01-02 00:04:35 +00:00
# Subtree
2020-03-08 12:07:40 +00:00
## Pulling another git repo into a subtree
> git subtree add -P config git@gitlab.com:bindrpg/config.git master
## Pulling a Subtree from an existing git
2020-01-02 00:04:35 +00:00
The project has subdirectories sub-1,sub-2,sub-3. The first should be its own repository, but should also retain its own history.
First, we extract its history as an independent item, and make that into a seprate branch.
> git subtree split --prefix=sub-1 -b sub
If you want something a few directories deep, you can use `--prefix=sub-1/dir-2/dir-3
Then go and create a new git somewhere else:
> cd ..;mkdir sub-1;cd sub-1;git init --bare
Then go back to your initial git repo, and do the following:
git push ../subtest sub:master
Finally, you can clone this repo from your original.
> git clone ../subtest
2020-01-02 03:12:18 +00:00
# Tricks
## Delete All History
> git checkout --orphan temp
> git add -A
> git commit -am "release the commits!"
> git branch -D master
> git branch -m master
> git push -f origin master
Gitlab requires more changes, such as going to `settings > repository` and switching the main branch, then stripping protection.
2020-01-02 00:04:35 +00:00
2020-01-11 13:29:06 +00:00
## Clean up Bloated Repo
> git fsck --full
> git gc --prune=now --aggressive
> git repack
2020-01-11 13:07:52 +00:00
## Find Binary Blobs
```
git rev-list --objects --all \
| git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' \
| sed -n 's/^blob //p' \
| sort --numeric-sort --key=2 \
| cut -c 1-12,41- \
| $(command -v gnumfmt || echo numfmt) --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest
```
2022-11-12 18:14:33 +00:00
# More
For big binary files (like images), see [git large-file-storage](git-lfs.md)