GIT_SSH_COMMAND="ssh -vv -i ~/.ssh/KEY" git clone

# `-F` ignores default SSH config
git config --local core.sshCommand "ssh -i ~/.ssh/KEY -F /dev/null"

Credentials other than SSH key

The Vanilla DevOps Git Credentials & Private Packages Cheatsheet
Git - git-credential-store Documentation

Change author

drrb/gitsu: User management and pairing for Git
Adds git su subcommand to set user from ~/.gitsu.

git - How to change the commit author for one specific commit? - Stack Overflow

# amend last commit
git commit --amend --author "New Author <new@email>"

How can I change the author (name / email) of a commit? | Learn Version Control with Git

# amend several commits, useful for not yet pushed commits
git rebase -i HEAD^5 # or committish
# pick commits to change author to `edit`
# for each commit
git commit --amend --author "New Author <new@email>" --no-edit
git rebase --continue

#!/bin/sh

FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --env-filter '
OLD_EMAIL="leesei@gmail.com"
CORRECT_NAME="Seasoned Bits Solutions"
CORRECT_EMAIL="seasoned.bits@gmail.com"

if [ "$GIT_COMMITTER_EMAIL" = "$OLD_EMAIL" ]
then
    export GIT_COMMITTER_NAME="$CORRECT_NAME"
    export GIT_COMMITTER_EMAIL="$CORRECT_EMAIL"
fi
if [ "$GIT_AUTHOR_EMAIL" = "$OLD_EMAIL" ]
then
    export GIT_AUTHOR_NAME="$CORRECT_NAME"
    export GIT_AUTHOR_EMAIL="$CORRECT_EMAIL"
fi
' --tag-name-filter cat -- --branches --tags

Merging from forked repo

Syncing a fork - User Documentation
Updating Slate · lord/slate Wiki

# setup fork origin as upstream
git remote add upstream <fork origin url>

# pull the latest changes from upstream
git fetch upstream
git fetch upstream --tags

# assuming you are on <feature> branch and have uncommitted updates
git stash
git co master

# rebase forked repo to upstream's master
git rebase upstream/master

# push the updates changes to our fork
git push origin master
git push origin --tags

# rebase <feature> branch onto latest code from master (expect conflicts)
# can also used before submitting pull request/push to repo
git co <feature>
git rebase master

# apply uncommitted changes
git stash pop

push empty commits

this is to re-trigger githooks

git commit --allow-empty -m "Trigger git hook"

commits after release

# get latest tag on current branch
git describe --abbrev=0 --tags
# show commits since latest tag
git log `git describe --tags --abbrev=0`..HEAD --oneline

force pull

git fetch origin main
git reset --hard FETCH_HEAD
git clean -df

updating master

# assuming you have a <feature> branch and have committed updates
git co master
git stash
# merge feature branch to master, squashing to a single commit
git merge --squash feature

update (unpushed) commit message

# last commit
git commit --amend
# older commits
# you can also reorder, squash the commits
git rebase -i HEAD~n  # last n commits
git rebase -i $parent_of_flawed_commit
# use 'r' to reword commits

Edit an incorrect commit message in Git - Stack Overflow
Changing a commit message - User Documentation

check diff before merge

How to check real git diff before merging from remote branch? - Stack Overflow

show files on another branch/commit

git show git show <committish>:<path/to/file>

Display a file from another branch - DEV Community 👩‍💻👨‍💻

list changed files

git diff-index --shortstat HEAD

Cherry-picking changes to add

git add --patch <file>
git add -p <file>

Commit only part of a file in Git - Stack Overflow
Git - git-add Documentation

Stage this hunk [y,n,q,a,d,/,j,J,g,s,e,?]?

Here is a description of each option:

y stage this hunk for the next commit
n do not stage this hunk for the next commit
q quit; do not stage this hunk or any of the remaining hunks
a stage this hunk and all later hunks in the file
d do not stage this hunk or any of the later hunks in the file
g select a hunk to go to
/ search for a hunk matching the given regex
j leave this hunk undecided, see next undecided hunk
J leave this hunk undecided, see next hunk
k leave this hunk undecided, see previous undecided hunk
K leave this hunk undecided, see previous hunk
s split the current hunk into smaller hunks
e manually edit the current hunk
? print hunk help

drop changes

# replace `file` in file system with copy in local repo
git checkout -- <file>
# unadd
git reset HEAD
# uncommit, changes still added to staging
git reset --soft
# reset local repo and workspace to upstream
git reset --hard origin/master

check unpushed commits

git log --branches --not --remotes

# Git 2.5+
git log @{push}

Deleting branch

# delete remote branch
git push origin :<branch>

# delete local branch
git branch -d <branch>

# delete local branch (force)
git branch -D <branch>

Renaming branch

git branch -m old_branch new_branch         # Rename branch locally
# push and set default branch to new_branch if using GitHub
git push origin :old_branch                 # Delete the old branch
git push --set-upstream origin new_branch   # Push the new branch, set local branch to track the new remote

Set tracking branch

git branch --set-upstream feature_branch origin/origin_branch
# checkout and track
git checkout -t origin/feature
# push and track
git push -u origin feature

rebase

git pull --rebase

git rebase HEAD feature && git rebase HEAD @{-2}

abandoning merge

git merge --abort  # git > 1.7.4
git reset --merge  # git < 1.7.4
git reset --hard HEAD # git < 1.6.2

create repo archive

git archive master -o <repo>.<tag>.zip
# deploy to server
git archive --format=tar origin/master | gzip -9c | ssh user@yourserver.com "tar --directory=/var/www -xvzf -"

Tagging and pushing tag to GitHub will aldo allow you to download the zipped code.

reduce repo size

How to Shrink a Git Repository
What is git gc and how does it work? | Atlassian Git Tutorial
Reduce git repository size - Stack Overflow
Git pull error: unable to create temporary sha1 filename - Stack Overflow
Optimize your repository using Git GC | by Ameet Prajapati | codeburst

git fsck # show dangling (orphaned) commit
git gc --aggressive --prune=now
git reflog expire --expire-unreachable=now --all git gc --prune=now

worktree

local fork with merge helpers

Git - git-worktree Documentation
Using multiple working trees in Git - DEV Community 👩‍💻👨‍💻
Experiment on your code freely with Git worktree | Opensource.com

Get current branch

git branch --show-current  # Git 2.22+
git rev-parse --abbrev-ref HEAD

Rebase feature branch

git reset --soft master

Commits count

This can be used as build number

git rev-list --count <branch>

difftool/mergetool

Using diff-so-fancy/dunk as PAGER

Git - git-difftool Documentation
Git - git-mergetool Documentation

Setting up and using Meld as your git difftool and mergetool - Stack Overflow
git merge - How to set Meld as git mergetool - Stack Overflow
Git Tutorial: Diff and Merge Tools - YouTube

The EXTREMELY helpful guide to merge conflicts - YouTube
VS Code's 3-way Merge Editor

so-fancy/diff-so-fancy: Good-lookin' diffs. Actually… nah… The best-lookin' diffs. :tada:
darrenburns/dunk: Prettier git diffs in the terminal 🎨

vimdiff

A better Vimdiff Git mergetool | Vim Tips Wiki | FANDOM powered by Wikia

Use vimdiff as git mergetool - Ruslan Osipov

sparse-checkout

Git - git-sparse-checkout Documentation
Bring your monorepo down to size with sparse-checkout - The GitHub Blog
如何在 Monorepo 透過 Git 的 Sparse Checkout 取得部分 Repo 內容 | The Will Will Web use cone mode
Partial clone | GitLab

submodules

Submodule saves a commit hash of another (library) repo in the current (master) repo

Mastering Git submodules — Medium

using project with submodules

# clone project with submodules
git clone --recursive
# for cloned project
git submodule update --init

# update local submodule hash
git submodule update --remote

git submodule sync
git submodule status

subtree

git/git-subtree.txt at master · git/git

Alternatives To Git Submodule: Git Subtree
The power of Git subtree - Atlassian Developers
Mastering Git subtrees — Medium
Understanding Git Subtree - HPC @ Uni.lu

git migrate from submodule to subtree | Life & Note - winterTTr

Old notes

git checkout -b redesign

# update working branch
git pull origin
git merge master
# OR
? git pull origin master:redesign

# commit
git pull origin
git checkout master
git merge redesign
git push origin master:master
# OR
git checkout redesign
git rebase master
git push origin redesign:master

# delete local branch
git branch -d redesign # after merge
git branch -D redesign # force

# delete remote branch
git push origin :redesign

# delete whole tree
git push origin :master

# diff staged with index
git diff --staged  # alias of --cached

# update a commit (unpushed)
git commit --amend <file>

# show commit info
git log [<some/path>]
git show [<some commit id>]

Fossil

Fossil: Home
Chisel - Fossil SCM Hosting
No-brainer SCM with Fossil

Git notes

Tutorials

Books

Manual/Reference/Fucked Up

Git Protocols

Commentaries/Internals

Repo size

Bindings

Plugins

GUI Clients

Terminal GUI

Blob

Workflow

Rebase

Video

Presentations

Tips and Tricks

Rewriting History

Githooks

Koan

Conditional config

Specify SSH key to use