tiaanduplessis / git-snippets

Collection of useful git snippets

git-snippets

Collection of useful git snippets

Table of Contents

• About
• Snippets
• License

About

This is just a bunch of git related snippets. Collected from around the internet.

Snippets

Delete untracked files

git clean -fn

Set local branch to track another local branch

git branch --set-upstream BRANCH ANOTHER_BRANCH

Clear git cache and add files back

git rm -r --cached .
git add .
git commit -m "fix .gitignore"

Unstage a file

git reset HEAD FILENAME

Undo local changes to file

git checkout -- FILENAME

Undo the last local commit

To unstage changes

git reset HEAD~1

To completely undo

git reset --hard HEAD~1

Create tracked local branch

git checkout -b NEW_BRANCH
git push --set-upstream ORIGIN NEW_BRANCH

Undo a merge

git merge --abort

Compare commit messages on two branches

git log --cherry-mark --oneline A_BRANCH..ANOTHER_BRANCH

See the files changed in a specific commit

git diff-tree --no-commit-id --name-only -r THE_COMMIT_ID

Get commits per author

git shortlog -sn --all --no-merges

Configure your details

git config --global user.name "Your Name"
git config --global user.email "[email protected]"

Update and merge your current branch with a remote

if ORIGIN is the remote repository, and MASTER the remote branch.

git pull ORIGIN MASTER

See previous git commands executed

history | grep git

Delete all untracked files and directories

git clean -f -d

Push to new remote branch and set as upstream

if ORIGIN is the remote repository, and MASTER the remote branch.

git branch -u ORIGIN/MASTER

Search for string

git grep 'STRING'

Get commits for a author

git log --author 'AUTHOR'

License

MIT