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
2k
Git勉強会@KRAY
danny
July 06, 2013
Tweet
Share
More Decks by danny
See All by danny
Datapiaのフロントエンドについて
f96q
0
460
新規サービスの技術選定と設計
f96q
1
18k
Vue.jsとRailsで作るWebアプリケーション
f96q
0
820
開発環境でDocker使ってみた
f96q
1
2.4k
2013年を振り返って
f96q
0
760
等強Ruby会議10に参加しての感想
f96q
2
950
Inside Tripclip
f96q
2
1.6k
Other Decks in Technology
See All in Technology
Android Audio: Beyond Winning On It
atsushieno
0
2.4k
💡Ruby 川辺で灯すPicoRubyからの光
bash0c7
0
120
Webブラウザ向け動画配信プレイヤーの 大規模リプレイスから得た知見と学び
yud0uhu
0
230
AIエージェントで90秒の広告動画を制作!台本・音声・映像・編集をつなぐAWS最新アーキテクチャの実践
nasuvitz
0
240
品質視点から考える組織デザイン/Organizational Design from Quality
mii3king
0
210
Django's GeneratedField by example - DjangoCon US 2025
pauloxnet
0
150
共有と分離 - Compose Multiplatform "本番導入" の設計指針
error96num
2
980
これでもう迷わない!Jetpack Composeの書き方実践ガイド
zozotech
PRO
0
1k
データ分析エージェント Socrates の育て方
na0
1
120
Practical Agentic AI in Software Engineering
uzyn
0
110
JTCにおける内製×スクラム開発への挑戦〜内製化率95%達成の舞台裏/JTC's challenge of in-house development with Scrum
aeonpeople
0
240
LLMを搭載したプロダクトの品質保証の模索と学び
qa
0
1.1k
Featured
See All Featured
Building Flexible Design Systems
yeseniaperezcruz
329
39k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
31
2.5k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
52
5.6k
Optimising Largest Contentful Paint
csswizardry
37
3.4k
Writing Fast Ruby
sferik
628
62k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
8
920
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
30
9.7k
The Language of Interfaces
destraynor
161
25k
How To Stay Up To Date on Web Technology
chriscoyier
790
250k
Building Better People: How to give real-time feedback that sticks.
wjessup
368
19k
GraphQLとの向き合い方2022年版
quramy
49
14k
The MySQL Ecosystem @ GitHub 2015
samlambert
251
13k
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; };
·ͱΊ • σʔλʔߏΈΔ͚ͩͰ͔Δ͜ͱ ͕͋Δ