Upgrade to Pro — share decks privately, control downloads, hide ads and more …

The 7 Habits of Git

Avatar for Sotaro Karasawa Sotaro Karasawa
August 27, 2013
Technology
100k
15

The 7 Habits of Git

Git 7つの心得
http://atnd.org/events/42085

Avatar for Sotaro Karasawa

Sotaro Karasawa

August 27, 2013

More Decks by Sotaro Karasawa

See All by Sotaro Karasawa
「事業目線」の正体 〜3つのフェーズのCTO経験から見えてきた、EMが持つべき視点 @ EMConf JP 2026
Avatar for Sotaro Karasawa sotarok
9
8.6k
大「個人開発サービス」時代に僕たちはどう生きるか
Avatar for Sotaro Karasawa sotarok
23
14k
P2B Haus法人サポータープランのご提案
Avatar for Sotaro Karasawa sotarok
2
1.7k
ソフトウェアxスタートアップから見た飲食と配送の世界 / The World of Food Deliverlies and Restaurant Businesses from a Software and Startup Perspective
Avatar for Sotaro Karasawa sotarok
2
1.3k
CTO 3度目の正直 / My 3rd CTO Career
Avatar for Sotaro Karasawa sotarok
21
11k
Introduction to the Corporate Solutions Engineering at MTC2018
Avatar for Sotaro Karasawa sotarok
1
36k
Mercari meetup for Corporate Engineering #1 / What is "Corporate Engineering"?
Avatar for Sotaro Karasawa sotarok
2
2.5k
Markdown and WYSIWYG
Avatar for Sotaro Karasawa sotarok
1
6.5k
20 Jan 2017 / Moving Beyond Borders - Mercari DAY
Avatar for Sotaro Karasawa sotarok
8
16k

Other Decks in Technology

See All in Technology
AI・HPC開発を支えるGPU環境の新しい選択肢 液冷GPUシステム「AquSys」の取り組み
Avatar for GPU UNITE gpuunite_official
0
250
【書籍出版記念】 10周回って、エージェント開発は RAGがすべてだった。〜RAGの歴史と開発現場で見えた実践知〜
Avatar for 為藤アキラ akiratameto
20
7.6k
[potatotips #96] Give Your AI Agent the Flutter Playbook
Avatar for Kenichi Kambara korodroid
0
170
AIで変わるエンジニアの働き方（仮）
Avatar for naoinaoi naoinaoi
0
550
dbt in Microsoft Fabric
Avatar for Ryoma Nagata ryomaru0825
0
260
ClaudeCodeでセキュリティ監視業務を半自動化_1年の運用でわかったAIに任せる設計の5つのポイント
Avatar for KintoTech_Dev kintotechdev
3
420
Android skills に学ぶ
Avatar for kokiko kokiko
0
180
markdown-poster Introduction
Avatar for kazamori kazamori
0
180
Kiro５兄弟のいまどきのセキュリティ基礎知識
Avatar for Hiroo Katoh kentapapa
0
270
型落ちシンクライアント端末のPoEモジュールを自作したかった話
Avatar for Takuto Nagami logica0419
0
440
あなたの知らないバージョン命名規則
Avatar for Satoru Takeuchi sat
PRO
2
760
Data Hubグループ 紹介資料
Avatar for Sansan, Inc. sansan33
PRO
0
3.2k

Featured

See All Featured
Building AI with AI
Avatar for Ines Montani inesmontani
PRO
1
1.2k
The browser strikes back
Avatar for Jono Alderson jonoalderson
0
1.5k
The Psychology of Web Performance [Beyond Tellerrand 2023]
Avatar for Tammy Everts tammyeverts
49
3.5k
Designing for Performance
Avatar for Lara Hogan lara
611
70k
The Success of Rails: Ensuring Growth for the Next 100 Years
Avatar for Eileen M. Uchitelle eileencodes
47
8.3k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
Avatar for Rebecca Miller-Webster rmw
35
3.8k
Ruling the World: When Life Gets Gamed
Avatar for Sebastian Deterding codingconduct
0
310
The Mindset for Success: Future Career Progression
Avatar for Greg Gifford greggifford
PRO
0
480
Collaborative Software Design: How to facilitate domain modelling decisions
Avatar for Kenny Baas-Schwegler baasie
1
290
AI Search: Implications for SEO and How to Move Forward - #ShenzhenSEOConference
Avatar for Aleyda Solis aleyda
1
1.3k
世界の人気アプリ100個を分析して見えたペイウォール設計の心得
Avatar for Akihiro Kokubo akihiro_kokubo
PRO
73
41k
End of SEO as We Know It (SMX Advanced Version)
Avatar for Michael King ipullrank
3
4.4k

Transcript

  1. Crocos, Inc. Sotaro Karasawa @sotarok http://facebook.com/sotarok (JUͭͷ৺ߏ͑ #get_great_git @ (FU(SFBU(JUCZ2JJUB

  2. ࣗݾ঺հ 4PUBSP,BSBTBXB!TPUBSPL ฑ୔૱ଠ࿠ IUUQRJJUBDPNTPUBSPL גࣜձࣾΫϩίε$SPDPT*OD 1)1 (JU 3FE#VMM

  3.  (3&&Ͱ47/ˠ(JUҠߦͷϓϩδΣΫτɻ։ൃϑϩʔΛ جຊ่ͣ͞(JUͷྑ͍ॴΛ׆͔ͤΔϑϩʔ࡞Γ  HJUEBJMZϦϦʔε  $SPDPTͰ(*5-"#ಋೖ 1VMM3FRVFTUϕʔεͷ։ൃϑϩʔ΁  (JU)VC

    1SJWBUF ʹҠߦ (JUʹؔͯ͠Կ͔͍͏͜ͱ͕͋Δͱ͢Ε͹

  4. ࠓ೔࿩͢͜ͱʮ৺ߏ͑ʯ ର৅ऀ (JUॳʙதڃऀ 1VMM3FRVFTUͦΖͦΖ͔ͳͷਓ

  5. ଉΛٵ͏Α͏ʹHJUTUBUVT

  6. -JOVYͰ ͳΜ͔MTͬͯଧͪ·͢ΑͶ Ջͳ࣌

  7. ͦͷؾ࣋Ͱ HJUTUBUVT

  8. ͋ͱEJGG HJUEJGG HJUEJGGDBDIFE

  9. ͱʹ͔͘DPNNJUલʹ HJUEJGGDBDIFE

  10. HJUDPNNJUB࢖͏ͳ ͻͱͭͻͱͭ BEE͢Δͱྑ͍Ͱ͢ 47/͔Βདྷͨਓ͕ Α͘΍ͬͯΔ͖͕͢Δ

  11. ͳΜͳΒBMJBTʹ BMJBTHTUHJUTUBUVT

  12. ଉΛు͘Α͏ʹHJUCSBODI

  13. 1VMM1VTI.FSHF3FCBTF ͢΂ͯͷૢ࡞Ͱ CSBODIΛҙࣝ͠·͠ΐ͏ʂ

  14. Α͋͘Δ(JUࣄނτοϓ ʮ͍͢·ͤΜɺ ɹҧ͏ϒϥϯνʹQVTIͪ͠Ό ͍·ͨ͠ʯ

  15. ͳΜͳΒBMJBTʹ BMJBTHCHJUCSBODIB

  16. ͪͳΈʹ ϓϩϯϓτʹදࣔͤͯ͞Δ

  17. ͪͳΈʹ ϓϩϯϓτʹදࣔͤͯ͞Δ τϥϒΔਓ͸ ͍͍ͩͨݟͯ·ͤΜʂ ༉அې෺ʂ

  18. NFSHF SFCBTFΛཧղ͢Δ

  19. େࡶ೺ʹݴͬͯ Git ษڧձ@ສ༿ #3 ʹߦ͖ͬͯͨ http://gom.hatenablog.com/entry/20090522/1243011416 ૬खͷมߋΛଚॏ͠·͠ΐ͏ NFSHFࣗ෼͕ओମɻࣗ෼ͷΛݩʹ૬खͷมߋΛద༻͢Δ SFCBTF૬ख͕ओମɻ૬खͷΛݩʹࣗ෼ͷมߋΛద༻͢Δ

  20. NFSHFࣗ෼͕ओମ SFCBTF૬ख͕ओମ

  21. NFSHF ࣗ෼ ૬ख

  22. NFSHF ࣗ෼ ૬ख ࣗ෼ͷมߋʹ૬ख ͷมߋΛ͔ͿͤΔ Πϝʔδ

  23. SFCBTF ࣗ෼ ૬ख

  24. SFCBTF Πϝʔδ ࣗ෼ ૬ख

  25. SFCBTF Πϝʔδ ࣗ෼ ૬ख

  26. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  27. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  28. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  29. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  30. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  31. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख

  32. SFNPUFϒϥϯν໊Λলུ͠ͳ͍

  33. ૢ࡞͸໌ࣔతʹ HJUQVTIPSJHJOGFBUVSFYYY

  34. ͻͱͭ΋͔ܽͤ·ͤΜ HJUTUBUVT HJUEJGG HJUBEE HJUEJGGDBDIFE HJUDPNNJU HJUQVTIPSJHJOGFBUVSFYYY

  35. มߋͪ͠ΌμϝͳιϨ

  36. ެ։ࡁΈͷ ྺ࢙Λ มߋͯ͠͸ ͍͚ͳ͍

  37. SFCBTF SFCBTFͱ͸ ྺ࢙Λ࠶ߏங͢Δ͜ͱ

  38. ެ։ࡁΈͱ͸ جຊతʹ͸ HJUQVTI ͨ͠΋ͷ ͞Εͨ΋ͷ

  39. ͦΕ͕Θ͔ͬͯͳ͍ͱ ଞਓ͕QVTIͨ͠΋ͷΛ DMPOF DIFDLPVU ͖ͯͯ͠ Կ͔͠ΒͷλΠϛϯάͰ HJUQVMMSFCBTF /(

  40. ·ͨ͸ ࣗ෼͕QVTIͨ͠΋ͷ ଞͷਓ͕DIFDLPVUͯ͠Δͷʹ HJUSFCBTF HJUQVTIPSJHJOGGFBUVSFYYYY

  41. SFCBTF͸ͲΜͲΜͯ͠ྑ͍͚Ͳ ศར͔ͩΒͶ commit ͷཻ౓ΛͶ ៉ྷʹͨ͠ΓͶ ͨͩ͠ɺଞͷਓͷ͜ͱΛߟ͑Δ ͜ͷ rebase ͷҙຯΛߟ͑Δ

  42. ௕͍࡞ۀ͸খϚϝʹSFCBTF

  43. DPOqJDU͸খ͍͞΄͏͕ྑ͍ ϝΠϯͱͳΔ։ൃϒϥϯν ೔ʑ rebase ͔͚·͠ΐ͏ Ϳ͔ͭΔͳΒখ͍͞͏ͪʹʂ

  44. ͖ͨͩͬ͠͞ͷ࿩ ଞਓ͕QVTIͨ͠΋ͷΛ DMPOF DIFDLPVU ͖ͯͯ͠ Կ͔͠ΒͷλΠϛϯάͰ HJUQVMMSFCBTF /(

  45. ·ͨ͸ merge ...

  46. (JU)VCͱ1VMM3FRVFTU࢖͏

  47. Git Λಋೖ͢Δ͜ͱ ʺϞμϯͰΠέͯΔ։ൃ

  48. Git ͷಋೖ ͱ͸ ։ൃϑϩʔɾۀ຿ϑϩʔͷ ࠶ߏஙͦͷ΋ͷ

  49. (JU࢖ͬͯΔͷʹ ϒϥϯν͸ͭͱ͔

  50. (JU)VC͕ͦ͜ (JUΛ࢖ͬͨ։ൃʹ͓ ͚Δ࠷ྑͷπʔϧͰ ͋Δʂ ଟ෼

  51. ౰࣌(*5-"#࢖ͬͯ·͚ͨ͠ͲͶฐࣾ όʔδϣϯ͕͋Γ·ͬͯ͘·͢Ͷ ΍ΊͯΑ͔ͬͨ

  52. 1VMM3FRVFTU ʮPull Requestʯ ͸Φʔϓϯιʔ εʹݶΒͣ࢖͑Δ༏Εͨ։ൃϑ ϩʔͩ http://d.hatena.ne.jp/sotarok/20120219/1329581585

  53. 1VMM3FRVFTU Ͱ͖Δ͚ͩ୯ҐΛখ͘͞

  54. 1VMM3FRVFTU େ͖͘ͳΓ͗͢Δ৔߹ τϐοΫϒϥϯν͔Β αϒτϐοΫͰϒϥϯνΛ੾Δ

  55. ࠷ۙ͋ͬͨେن໛։ൃ αϒτϐοΫϒϥϯν 33 branch merges 165 commits

  56. ࠷ޙʹͦͷଞͷ࿩୊

  57. 1VMM3FRVFTUຖͷ࣮ߦ؀ڥ Production = marketing.crocos.jp Pull Request #123 = pr123.dev.marketing.crocos.jp

  58. 1VMM3FRVFTUຖͷ࣮ߦ؀ڥ nginxͰ ... server_name ~^pr([^.]+).dev.([^.]+) ɹɹɹɹ\.marketing\.crocos\.jp$; set $pr_name $1; set

    $app_name $2;

  59. (JU'MPXY(JU)VC'MPX @ship @battleship

  60. ଟ෼ࢀߟʹͳΔࢿྉ

  61. ා͘ͳ͍(JU IUUQLPUBTIBUFOBCMPHKQFOUSZ  (JU#PPL IUUQHJUTDNDPNCPPLKB

  62. -FBSOJOH(JU#SBODIJOH IUUQLTXEDDMFBSO(JU#SBODIJOHKB "TVDDFTTGVM(JUCSBODIJOHNPEFMΛ ຋༁͠·ͨ͠ IUUQLFJKJOTPOZBCBOCMPHTQPUKQ TVDDFTTGVMHJUCSBODIJOHNPEFMIUNM

  63. (JUΛऔΓר͘؀ڥɺ ։ൃϑϩʔͷ࿩ ૬ஊ૭ޱΛઃ͚·ͨ͠

  64. SFDSVJU!DSPDPTDPKQ

  65. None