git-tricks.md

Git Tricks

Display log in reverse (starting from beginning)

git log --reverse

List all files that have changed from master

git diff --name-only master | tr '\n' ' '

Revert a single commit (without yet creating a new commit)

git revert --no-commit 0766c053

Revert back to a commit (without yet creating a new commit)

git revert --no-commit 0766c053..HEAD

Checkout files from another branch

git checkout --

Checkout and filter file changes from another branch

git diff --name-only | grep "app/" | while read line; do git checkout -- $line; done;

Recover deleted/cleared stashes

git fsck --unreachable | grep commit | cut -d" " -f3 | xargs git log --merges --no-walk --grep=WIP

Then simply git stash apply <commit hash>.

Get current branch name

git branch | grep * | cut -d ' ' -f2