Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Sign up for free
Menu
Search
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Pricing
Search
Sign in
Sign up for free
Git勉強会@KRAY
Search
danny
July 06, 2013
Technology
2.2k
1
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
Git勉強会@KRAY
danny
July 06, 2013
Transcript
30 slides
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; };
·ͱΊ • σʔλʔߏΈΔ͚ͩͰ͔Δ͜ͱ ͕͋Δ
More Decks by danny
See All by danny
Datapiaのフロントエンドについて
f96q
0
560
新規サービスの技術選定と設計
f96q
1
18k
Vue.jsとRailsで作るWebアプリケーション
f96q
0
860
開発環境でDocker使ってみた
f96q
1
2.4k
2013年を振り返って
f96q
0
790
等強Ruby会議10に参加しての感想
f96q
2
980
Inside Tripclip
f96q
2
1.7k
Other Decks in Technology
See All in Technology
ノードが消える前提で設計する!Karpenterで金融システムを止めないためのノウハウ大全
daitak
1
250
信頼性を犠牲にせず、PR マージからデプロイまで人の介入を完全にゼロにするまでの道のり
knwoop
4
2.1k
OpenTelemetryで変わった 新時代のCloudWatchメトリクス監視
tsukuboshi
0
500
Well, that’s weird…
csswizardry
1
200
ポケモンバトルのAIエージェント
koji_kawamura
0
230
HTTP通信に使おうとすると実はめんどくさいfile_get_contents
maguroalternative
0
260
クラウドでも使えるNetApp -現場目線での設計とクラウドバックアップの活用
ryutakondo
1
330
エンタープライズIAMについて - ID・権限をどう統制するか
oidfj
1
320
共通基盤の実装に Kotlin - Quarkus を選定した理由と採用したアーキテクチャ
nealle
1
160
技術書典で本を売る流れ
yoshimura_datam
0
140
データから見る AI時代のエンジニア転職と採用
junya_okura
4
1.3k
[DBRE Summit 26] DBRE はデータベース運用をどう変えたのか
_awache
0
130
Featured
See All Featured
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
50
10k
Mind Mapping
helmedeiros
1
450
The Anti-SEO Checklist Checklist. Pubcon Cyber Week
ryanjones
0
310
Navigating Algorithm Shifts & AI Overviews - #SMXNext
aleyda
1
1.7k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
230
23k
Money Talks: Using Revenue to Get Sh*t Done
nikkihalliwell
0
570
Facilitating Awesome Meetings
lara
57
7.2k
Design of three-dimensional binary manipulators for pick-and-place task avoiding obstacles (IECON2024)
konakalab
0
670
Building Flexible Design Systems
yeseniaperezcruz
330
41k
Building a Modern Day E-commerce SEO Strategy
aleyda
45
9.3k
Are puppies a ranking factor?
jonoalderson
2
4.2k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
38
3.1k