Git Tips

A handful of git tips from a VHX dev lunch.

Transcript

1. Git Tips
2. git bisect When and where did this break?
3. git bisect • find working commit hash • git bisect start • git bisect bad • git bisect good 8579541 • git bisect reset
4. git add ––patch This is done, but this isn’t.
5. git add ––patch • git add ––patch • Stage this hunk [y,n,q,a,d,/,e,?]? • y - yes, n - no, ? - help
6. git cherry-pick I need that here, now.
7. git cherry-pick • find desired commit hash • git cherry-pick 8579541
8. git stash This isn’t done, but I need to save it.
9. git stash • git stash • git stash save “begin some function” • git stash list ! • git stash pop stash@{0}
10. git commit ––amend Fix local commit typo or add file
11. git commit ––amend • git add path/file/file.ext • git commit ––amend
12. git reflog Your local git activity log
13. git reflog • git reflog ! ! • git reset --hard 8579541
14. git reset ––hard Clean your working space git clean -f Delete untracked files (-n to preview) git diff -w Diff without whitespace