vim-ale

title	homepage	tagline	description
Git	https://git-scm.com	git: --fast-version-control	> Git is a fast, scalable, distributed revision control system with an > unusually rich command set that provides both high-level operations and full > access to internals.

Github's Git 'Hello World' is a good place to get started if you're new to git.

How to commit files

git add ./path/to/file1
git add ./path/to/file2
git commit -m "my summary for this commit"

How to ignore common files

In your project repository create a .gitignore file with patterns of fies to ignore

.env*
*.bak
*.tmp
.*.sw*

How to create a branch

This will branch from the branch you're currently on.

git checkout -b my-branch-name

How to rebase

Rebase when fetching new updates

git pull --rebase origin master

Rebase a feature branch from master before a merge

# update master
git fetch
git checkout master
git pull

# go back to your feature branch
git checkout my-feature

# start the rebase
git rebase master

# fix conflicts if you need to, and then continue
git add ./my-merged-file
git rebase --continue

How to authenticate git with deploy tokens

Abbreviated from The Vanilla DevOps Git Credentials & Private Packages Cheatsheet:

First, update .gitconfig to handle each type of git URL (git, ssh, and http) as https:

git config --global url."https://api@github.com/".insteadOf "https://github.com/"
git config --global url."https://ssh@github.com/".insteadOf "ssh://git@github.com/"
git config --global url."https://git@github.com/".insteadOf "git@github.com:"

Next, create a .git-askpass:

echo 'echo $MY_GIT_TOKEN' > $HOME/.git-askpass
chmod +x $HOME/.git-askpass

Finally, add the following ENVs to your deployment environment:

GIT_ASKPASS=$HOME/.git-askpass

# Relpace xxxx... with your deploy token
MY_GIT_TOKEN=xxxxxxxxxxxxxxxx

In the case of Github it may be useful to create a read-only deploy user for your organization.

This can work with Docker, Github, Gitlab, Gitea, CircleCI, and many more.