Git Tips and Tricks

gittipsandtricks.md

Ignore tracked files

git update-index --assume-unchanged dir-im-removing/
git update-index --assume-unchanged config/database.yml
git update-index --skip-worktree

Change previous commit author

git rebase -i <earliercommit>
git commit --amend --author="Author Name <email@address.com>"

https://groups.google.com/forum/#!topic/git-users/a6zEdEQSpHw
git commit --amend -C HEAD --reset-author

Fetch branch from remote repo

git checkout --track origin/daves_branch

Push local branch to remote repo

git push -u origin experimental

Copy-paste from one branch to another

git checkout source_branch <paths>...

Rename local branch

git branch -m
git branch -m

Add remote repo

git remote add <alias> <remote path>
git remote -v

Add upstream

git remote add upstream <path>

Remove commit

git reset --hard HEAD~1
git reset HEAD^

HEAD^ same as HEAD~1

Update branchs list from the remote

git remote update origin --prune

Delete remote branch

git push --delete
git push :

Cherry piking

git cherry-pick X
git cherry-pick A..B #A should be older than B, A is excluded B is included
git cherry-pick A^..B # including A