Dr Blinken

blog, bentosheets and railspages.

GIT

work in progress

##stage files for commit:

git add <file> ##unstage files:
git rm --cached <file> 

see Git Book

remove files that have been removed without git

git rm $(git ls-files --deleted)

Info

git log

see changes in a single commit:

git show <commit>

Undoing

delete last commit: see stackoverflow

Committing

To stage deleted files for commit: git add . -A

rebase

Rebase man page Rebase chapter in git book

git rebase -i <hash of first commit you don't wanna change>

two default editors open: one to change the commits, and if you’re squashing commits together, one to edit a joined commit message

It’s best to do this before merging a branch / pushing upstream. If you already pushed upstream - to github e.g. - you can push the changes with git push origin master -f

which should absolutely only be done if noone has work based on that upstream rep.