Cool Git Tricks (That I Learn When Things Go Badly) [1/2]
4 likes9,589 views
This document discusses various "cool git tricks" the author has learned, including: - Writing detailed commit messages - Using tab completion for branches - Customizing the bash prompt to show git status - Advanced grep searches across commits - Bisecting to find problematic commits - Rewriting history to remove commits It encourages learning more about git's capabilities beyond basic usage to make version control easier.
Cool Git Tricks (That I Learn When Things Go Badly) [1/2]
- 1. Cool Git Tricks (That I learn when things go badly.) @cczona
- 2. Carina C. Zona @cczona www.cczona.com @cczona
- 3. I write a detailed commit message. (About some other changeset.) @cczona
- 4. $ git commit # Changes to be committed: #... # odified: foo.txt m
- 5. $ git commit -v # Changes to be committed: #... # odified: foo.txt m #... -old line +new line
- 6. I create long branch names. (Then have to type all that.) @cczona
- 7. git/contrib/completion/ git-completion.bash cp git-completion.bash ~/.git-completion.sh echo source ~/.git-completion.sh >> ~/.bashrc
- 8. $ git checkout <tab><tab> 0.1-mvp-release marketing-content-dump 2.0-public-release master authentication-basic optimize-for-webkit button-to-pay-me redesign-for-fall-2012 live-customer-chat ui-performance-enhance
- 9. $ git checkout b<tab> Switched to branch 'button-to-pay-me'
- 10. I use ‘git status’ (A lot.) @cczona
- 11. git/contrib/completion/ git-prompt.sh cp git-prompt.sh ~/.git-prompt.sh echo source ~/.git-completion.sh >> ~/.bashrc
- 12. #master|MERGE $ #master|REBASE-i $ #master + $ # tracked #master $ $ # stash #master> $ # upstream
- 13. 3 pending on foundation#master ~/repo/foundation/css $ git add . 3 pending on foundation#master ~/repo/foundation/css $ git commit ... 0 pending on foundation#master ~/repo/foundation/css $ touch new.txt 1 pending on foundation#master ~/repo/foundation/css $
- 14. I pathologically avoid `git add .` (Now.) @cczona
- 15. $ git grep -e stupid --and -e boss index.html: The boss is a stupidhead
- 16. $ git grep -e promotion --or -e bargain --not -e (coupon|discount)
- 17. # working area tracked $ git grep # working area tracked & untracked $ git grep --untracked # working area all (ignore .gitignore) $ git grep --untracked --no-exclude-standard # staged $ git grep --cached
- 18. # arbitrary commit $ git grep“2007”HEAD^ # range $ git grep “2007”c0c1e80..141a16a # every commit $ git grep“2007”$(git rev-list --all)
- 19. I don’t necessarily detect a problem immediately. (Time machine needed.) @cczona
- 20. $ git bisect start $ git bisect bad HEAD $ git bisect good v2.0 Bisecting: 44 revisions left to test after this (roughly 6 steps) ... b047b0 is first bad commit
- 21. I sometimes need to pretend a commit never happened. (Like, even rebase ain’t gonna cut it.) @cczona
- 22. $ git checkout HEAD~10 ... $ ls about.html contact.html uber-secret-never-commit-this.txt
- 23. (leaving out many crucial details...) filter-branch # remove from local commits... reflog expire # make artifacts eligible for garbage collection gc # do the garbage collection push --force # rewrite remote history
- 24. Git can be a pain. It also has cool tricks to take pain away. (Whew.) @cczona
- 25. Questions? Carina C. Zona www.cczona.com @cczona @cczona
- 26. Learn More • http://git-scm.com/book • http://blog.bitfluent.com/post/27983389/git- utilities-you-cant-live-without • https://help.github.com/articles/remove- sensitive-data @cczona
Editor's Notes
- #2: \n
- #3: \n
- #4: \n
- #5: \n
- #6: \n
- #7: \n
- #8: \n
- #9: \n
- #10: \n
- #11: \n
- #12: \n
- #13: \n
- #14: \n
- #15: \n
- #16: \n
- #17: \n
- #18: \n
- #19: \n
- #20: \n
- #21: \n
- #22: \n
- #23: \n
- #24: \n
- #25: \n
- #26: \n
- #27: \n
- #28: \n
- #29: \n
- #30: \n
- #31: \n
- #32: \n
- #33: \n
- #34: \n
- #35: \n
- #36: \n
- #37: \n
- #38: \n
- #39: \n
- #40: \n
- #41: \n
- #42: \n
- #43: \n
- #44: \n
- #45: \n
- #46: \n
- #47: \n
- #48: \n
- #49: \n
- #50: \n
- #51: \n
- #52: \n
- #53: \n
- #54: \n
- #55: \n
- #56: \n
- #57: \n
- #58: \n
- #59: \n
- #60: \n
- #61: \n
- #62: \n
- #63: \n
- #64: \n
- #65: \n
- #66: \n
- #67: \n
- #68: \n
- #69: \n
- #70: \n
- #71: \n
- #72: \n
- #73: \n
- #74: \n
- #75: \n
- #76: \n
- #77: \n
- #78: \n
- #79: \n
- #80: \n
- #81: \n
- #82: \n
- #83: \n
- #84: \n
- #85: \n
- #86: \n
- #87: \n
- #88: \n
- #89: \n
- #90: \n
- #91: \n
- #92: \n
- #93: \n
- #94: \n
- #95: \n
- #96: \n
- #97: \n
- #98: \n
- #99: \n
- #100: \n
- #101: \n
- #102: \n
- #103: \n
- #104: \n
- #105: \n
- #106: \n
- #107: \n
- #108: \n
- #109: \n
- #110: \n
- #111: \n
- #112: \n
- #113: \n
- #114: \n