10 Git Command You Should Start Using Today

10 Git Command You Should Start Using Today @ Laravel Meetup Taipei 2025 #1

Transcript

1. Mouson (陳佑 竹 ) <mouson@gmail.com> 2025.04.19 台 日 技術交流聚會@ 言文 字 10 Command You Should Start Using Today
2. About Me • Mouson (陳佑 竹 ) • GitLab Hero • Senior System Analyst • GitLab Taipei User Group / DevOps Taiwan / Laravel Taiwan • mouson@gmail.com • https://gitlab.com/mo-playground • https://gitlab.com/mouson
3. is 20 Years Old https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23ca2e25604af290
4. Some Command You Should Using Today 01 02 03 04 05 06 07 08 09 10
5. Switch to a speci fi ed branch. switch Ref: https://git-scm.com/docs/git-switch 01 02 03 04 05 06 07 08 09 10 v2.23
6. Restore speci fi ed paths in the working tree with some contents from a restore source. restore Ref: https://git-scm.com/docs/git-restore 01 02 03 04 05 06 07 08 09 10 v2.23
7. Save your local modi fi cations to a new stash with messages stash push -m Ref: https://git-scm.com/docs/git-stash v2.13 01 02 03 04 05 06 07 08 09 10
8. -r, --rebase-merges By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With --rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. rebase -r Ref: https://git-scm.com/docs/git-rebase 01 02 03 04 05 06 07 08 09 10
9. rebase -r Ref: https://git-scm.com/docs/git-rebase 01 02 03 04 05 06 07 08 09 10 A B C D E F G H I J git rebase D git rebase D -r
10. rebase -r Ref: https://git-scm.com/docs/git-rebase 01 02 03 04 05 06 07 08 09 10 A B C D E F G H I J git rebase D git rebase D -r A B C D E' F' G' H' I' J'
11. rebase -r Ref: https://git-scm.com/docs/git-rebase 01 02 03 04 05 06 07 08 09 10 A B C D E F G H I J git rebase D git rebase D -r A B C D E' F' G' H' I' J' A B C D E' F' G' H' I' J'
12. Reuse recorded resolution of con fl icted merges rerere https://git-scm.com/docs/git-rerere 01 02 03 04 05 06 07 08 09 10 v1.5.3
13. Local GIT Rerere Sample I have a World!!! feature master I have a Apple !!! I have a Pen !!!
14. Local GIT Rerere Sample I have a World!!! feature master I have a Apple !!! I have a Pen !!! I have a Apple Pen !!!
15. GIT Rerere Demo 1. enable rerere feature git con fi g --global rerere.enabled true https://goo.gl/8wj1he
16. Local GIT Rerere Sample I have a World!!! feature master I have a Apple !!! I have a Pen !!!
17. Local GIT Rerere Sample I have a World!!! feature master I have a Apple !!! I have a Pen !!!
18. Local GIT Rerere Sample I have a World!!! feature master I have a Apple !!! I have a Pen !!!
19. Local GIT Rerere Sample I have a World!!! feature master I have a Apple !!! I have a Pen !!!
20. Manage multiple working trees attached to the same repository. worktree https://git-scm.com/docs/git-worktree 01 02 03 04 05 06 07 08 09 10 v2.5
21. Local GIT worktree Sample I have a World!!! feature master I have a Apple !!! I have a Pen !!! 01 02 03 04 05 06 07 08 09 10
22. Reduce your working tree to a subset of tracked fi les. sparse-checkout 01 02 03 04 05 06 07 08 09 10 https://git-scm.com/docs/git-sparse-checkout
23. Use binary search to fi nd the commit that introduced a bug bisect Ref: https://git-scm.com/docs/git-bisect v1.5 01 02 03 04 05 06 07 08 09 10
24. v2.3
25. ? ? ? ? ? ? ? HEAD Some feature was a failure after merge v2.3
26. ? ? ? ? ? ? ? HEAD Some feature was a failure after merge v2.3 git bisect start HEAD v2.3
27. Use git bisect search failure commit v2.3 ? ? ? ? ? ? ? HEAD git bisect start HEAD v2.3
28. Use git bisect search failure commit v2.3 ? ? ? ? ? ? ? HEAD git bisect start HEAD v2.3
29. Use git bisect search failure commit v2.3 ? ? ? ? ? ? ? HEAD BAD git bisect start HEAD v2.3
30. Use git bisect search failure commit v2.3 ? ? ? ? ? ? ? HEAD BAD
31. Use git bisect search failure commit v2.3 ? ? ? ? ? ? ? HEAD BAD git bisect bad
32. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD git bisect bad
33. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD git bisect bad
34. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD
35. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD
36. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD GOOD
37. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD GOOD git bisect good
38. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD GOOD git bisect good
39. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD GOOD GOOD git bisect good
40. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD GOOD GOOD
41. Use git bisect search failure commit v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD GOOD GOOD X
42. use git blame fi nd detail v2.3 ? ? ? BAD ? ? ? HEAD BAD BAD BAD GOOD GOOD X
43. Print lines matching a pattern grep https://git-scm.com/docs/git-grep 01 02 03 04 05 06 07 08 09 10 v0.99.4
44. Run tasks to optimize Git repository data gc, commit-graph, loose-objects... maintenance https://git-scm.com/docs/git-maintenance 01 02 03 04 05 06 07 08 09 10 v2.29
45. Q & A 陳佑 竹 Mouson <mouson@gmail.com> https://facebook.com/mouson