Old git mastery

[EVOLVING POST]

Practices

Working with branches

• Remove branches that have been integrated

Working with commits

• local vs pull request : Practice advice reference. Local may contain several commits to track subparts of change and benefit from versioning advantages, but this complexity can be deleted before the merge to keep the history simple (cf git squash).

Commands memo

Branches

git fetch -p origin (fetch branches from remote, prunes the local cache)

git branch -a (List all branches remote and local known by local)

History

git log --all --graph --decorate --oneline (allows to see every known commit and stash, really helpful. May be confusing about graph lines)

Stash

(source: stack-overflow thread)
git stash --all (stashes all files, including untracked and ignored files)
git stash --include-untracked (no longer touches ignored files (tested on git 2.16.2))