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
15
100k

The 7 Habits of Git

Git 7つの心得
http://atnd.org/events/42085
Avatar for Sotaro Karasawa

Sotaro Karasawa

August 27, 2013
Tweet

More Decks by Sotaro Karasawa

See All by Sotaro Karasawa
P2B Haus法人サポータープランのご提案
Avatar for Sotaro Karasawa sotarok
2
1.4k
ソフトウェアxスタートアップから見た飲食と配送の世界 / The World of Food Deliverlies and Restaurant Businesses from a Software and Startup Perspective
Avatar for Sotaro Karasawa sotarok
2
1.2k
CTO 3度目の正直 / My 3rd CTO Career
Avatar for Sotaro Karasawa sotarok
21
10k
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.3k
Markdown and WYSIWYG
Avatar for Sotaro Karasawa sotarok
1
6.1k
20 Jan 2017 / Moving Beyond Borders - Mercari DAY
Avatar for Sotaro Karasawa sotarok
8
15k
PHPBLT の心得 / PHPBLT #5 @ペパボ
Avatar for Sotaro Karasawa sotarok
5
3.5k
Wiki についての今昔物語 / Crowi
Avatar for Sotaro Karasawa sotarok
5
15k

Other Decks in Technology

See All in Technology
研究開発部メンバーの働き⽅ / Sansan R&D Profile
Avatar for Sansan, Inc. sansan33
PRO
3
17k
API の仕様から紐解く「MCP 入門」 ～MCP の「コンテキスト」って何だ？～
Avatar for CData Software Japan cdataj
0
150
（新URLに移行しました）FASTと向き合うことで見えた、大規模アジャイルの難しさと楽しさ
Avatar for Kyosuke Awata wooootack
0
690
AWS と定理証明 〜ポリシー言語 Cedar 開発の舞台裏〜 #fp_matsuri / FP Matsuri 2025
Avatar for y_taka_23 ytaka23
9
2.4k
In Praise of "Normal" Engineers (LDX3)
Avatar for Charity Majors charity
2
840
OCI Oracle Database Services新機能アップデート(2025/03-2025/05)
Avatar for oracle4engineer oracle4engineer
PRO
1
140
新卒3年目の後悔 〜機械学習モデルジョブの運用を頑張った話〜
Avatar for camay kameitomohiro
0
210
マルチテナント+マルチプロダクト SaaS への AI Agent の組み込み方
Avatar for KNOWLEDGE WORK / 株式会社ナレッジワーク kworkdev
PRO
2
320
Tenstorrent HW/SW 概要説明
Avatar for Tenstorrent Japan tenstorrent_japan
0
390
AI技術トレンド勉強会 #1 MCPの基礎と実務での応用
Avatar for Nisei Kimura nisei_k
1
190
生成AIをテストプロセスに活用し"よう"としている話 #jasstnano
Avatar for Makky makky_tyuyan
0
150
OpenTelemetry Collector internals
Avatar for ymotongpoo ymotongpoo
5
530

Featured

See All Featured
Build The Right Thing And Hit Your Dates
Avatar for Maggie C. maggiecrowley
36
2.7k
10 Git Anti Patterns You Should be Aware of
Avatar for Lemi Orhan Ergin lemiorhan
PRO
657
60k
Navigating Team Friction
Avatar for Lara Hogan lara
186
15k
Making Projects Easy
Avatar for Brett Harned brettharned
116
6.2k
A Tale of Four Properties
Avatar for Chris Coyier chriscoyier
159
23k
Balancing Empowerment & Direction
Avatar for Lara Hogan lara
1
290
Code Reviewing Like a Champion
Avatar for maltzj maltzj
524
40k
Making the Leap to Tech Lead
Avatar for Ryan Cromwell cromwellryan
134
9.3k
Designing for Performance
Avatar for Lara Hogan lara
609
69k
Mobile First: as difficult as doing things right
Avatar for Swwweet swwweet
223
9.6k
A designer walks into a library…
Avatar for Paul Jervis Heath pauljervisheath
206
24k
Intergalactic Javascript Robots from Outer Space
Avatar for Vicent Martí tanoku
271
27k

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