Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git勉強会@KRAY
Search
danny
July 06, 2013
Technology
1
1.9k
Git勉強会@KRAY
danny
July 06, 2013
Tweet
Share
More Decks by danny
See All by danny
Datapiaのフロントエンドについて
f96q
0
420
新規サービスの技術選定と設計
f96q
1
17k
Vue.jsとRailsで作るWebアプリケーション
f96q
0
790
開発環境でDocker使ってみた
f96q
1
2.4k
2013年を振り返って
f96q
0
740
等強Ruby会議10に参加しての感想
f96q
2
930
Inside Tripclip
f96q
2
1.5k
Other Decks in Technology
See All in Technology
AWS CDK コントリビュート はじめの一歩
yendoooo
1
120
職種に名前が付く、ということ/The fact that a job title has a name
bitkey
1
250
ISUCONにPHPで挑み続けてできるようになっ(てき)たこと / phperkaigi2025
blue_goheimochi
0
140
一人QA時代が終わり、 QAチームが立ち上がった話
ma_cho29
0
290
AIエージェント完全に理解した
segavvy
4
270
DevinはクラウドエンジニアAIになれるのか!? 実践的なガードレール設計/devin-can-become-a-cloud-engineer-ai-practical-guardrail-design
tomoki10
3
1.4k
AI・LLM事業部のSREとタスクの自動運転
shinyorke
PRO
0
300
Amazon GuardDuty Malware Protection for Amazon S3を使おう
ryder472
2
110
数百台のオンプレミスのサーバーをEKSに移行した話
yukiteraoka
0
680
30 代子育て SRE が考える SRE ナレッジマネジメントの現在と将来
kworkdev
PRO
0
110
大規模サービスにおける カスケード障害
takumiogawa
2
260
[CATS]Amazon Bedrock GenUハンズオン座学資料 #2 GenU環境でRAGを体験してみよう
tsukuboshi
0
150
Featured
See All Featured
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
Done Done
chrislema
183
16k
The Language of Interfaces
destraynor
157
24k
How to Ace a Technical Interview
jacobian
276
23k
How to train your dragon (web standard)
notwaldorf
91
5.9k
KATA
mclloyd
29
14k
Stop Working from a Prison Cell
hatefulcrawdad
268
20k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
28
1.6k
4 Signs Your Business is Dying
shpigford
183
22k
A Tale of Four Properties
chriscoyier
158
23k
Building Flexible Design Systems
yeseniaperezcruz
328
38k
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
12
610
Transcript
Gitษڧձ@KRAY danny גࣜձࣾΫϨΠ 2013 7/5
ࣗݾհ • Blog (http://f96q.github.io/) • ීஈRailsͰWebΞϓϦͷ։ൃΛͬͯ ·͢ • ࠷ۙiPhoneΞϓϦͷ։ൃΛͬͯ·͢
ࣗݾհ Rubyist Magazine 0041߸
ࣗݾհ
ࠓ͢͜ͱ • Gitͷ࣮ફతͳ͍ํ • GitLabʹ͍ͭͯ • Gitͷιʔείʔυղੳ
Gitͷ࣮ફతͳ͍ํ
ҰͭͷϦϙδτϦͰσβΠϯ༻ͷ੩త htmlͱΞϓϦͷιʔείʔυΛཧ͠ ͨΜ͚ͩͲ
orphan branch • ࠜݩ͕ͭͳ͕ͬͯͳ͍ϒϥϯνΛ࡞Ε Δ • git checkout --orphan branch-name
Ͱ͍͍ͪͪσβΠϯ༻ͷϒϥϯνͱ ։ൃ༻ͷϒϥϯνΛΓସ͑ͨ͘ͳ͍ Μ͚ͩͲ
git-new-workdir • ϫʔΩϯάίϐʔΛෳ࣋ͯΔ
rebaseͨ͠Βmergeίϛοτ͕ফ͑ͯ ͠·͏Μ͚ͩͲ
mergeίϛοτΛอ࣋ͨ͠··rebase • git rebase -p branch-name
ϦϞʔτϦϙδτϦʹpush͢Δͱ411 ͕ฦ͖ͬͯͯpushͰ͖ͳ͍Μ͚ͩͲ
• git config http.postBufferͷαΠζΛେ͖ ͘͢Δ
աڈͷίϛοτΛૉૣ͘ಡΈ͍ͨΜͩ ͚Ͳ
ϦϙδτϦϒϥβ •brew install tig
MacͰͬͯΔͱ.DS_StoreΛίϛοτ ͦ͠͏ʹͳΔΜ͚ͩͲ
ίϛοτͷର͔Β֎͢ [core] excludesfile = ~/.gitignore .gitconfig ~/.gitignore .DS_Store
GitLabʹ͍ͭͯ
Gitlabʹ͍ͭͯ • GithubΫϩʔϯ • RailsΞϓϦ • ࣾͩͱGitorious + GitHub͔ΒGitLabʹ •
GitoriousͩͱɺͲͷϢʔβʔͰશ෦ͷϦϙδτϦͷιʔε͕ΈΔ ͜ͱ͕Ͱ͖ͨ • GitHubͩͱϓϥΠϕʔτϦϙδτϦ૿͑Δ΄Ͳ͓͕͔͔ۚΔ
GitLab͍͍ͱ͜Ζ • ಛఆͷϢʔβʔ͚ͩΈΕΔϦϙδτϦ ࡞ΕΔ • ϓϥΠϕʔτϦϙδτϦ࡞Γ์ • merge request •
GitHubʹൺͨΒػೳతʹྼΔͱ͜ Ζ͋Δ͚Ͳͦͦ͑͜͜Δ
GitLabେมͳ͜ͱ • αʔόʔ༻ҙ • ͕ग़ͨΒࣗͨͪͰղܾ͠ͳ͍ͱ ͍͚ͳ͍ • ͬͯΔͱෆ۩߹ʹૺ۰ • sidekickམͪͯΔ
• ϝʔϧ͕ඈͳ͍ • ϦϙδτϦ৽ن࡞ͯ͠࠷ॳͷpushͰ͖ͳ͍
Gitͷιʔείʔυղੳ
GitͷΦϒδΣΫτͷλΠϓ enum object_type { OBJ_BAD = -1, OBJ_NONE = 0,
OBJ_COMMIT = 1, OBJ_TREE = 2, OBJ_BLOB = 3, OBJ_TAG = 4, /* 5 for future expansion */ OBJ_OFS_DELTA = 6, OBJ_REF_DELTA = 7, OBJ_ANY, OBJ_MAX };
Object struct object { unsigned parsed : 1; unsigned used
: 1; unsigned type : TYPE_BITS; unsigned flags : FLAG_BITS; unsigned char sha1[20]; };
bolb struct blob { struct object object; };
tree struct tree { struct object object; void *buffer; unsigned
long size; };
tag struct tag { struct object object; struct object *tagged;
char *tag; unsigned long date; };
commit struct commit { struct object object; void *util; unsigned
int index; unsigned long date; struct commit_list *parents; struct tree *tree; char *buffer; }; struct commit_list { struct commit *item; struct commit_list *next; };
·ͱΊ • σʔλʔߏΈΔ͚ͩͰ͔Δ͜ͱ ͕͋Δ