Tweet
Tweet

Slide 1

Slide 1 text

ͳͥGitͰόΠφϦϑΝΠ ϧΛ͓͍ͯ͸͍͚ͳ͍͔ Gitͷ಺෦ߏ଄͔Βߟ͑Δ 2017/08/31 kondo takeshi

Slide 2

Slide 2 text

Git͓͡͞Μ

Slide 3

Slide 3 text

΅͘ʮ͜Εยํ͍Βͳ͘ͳ͍ʁ ফͦ͏Αʯ ͱ͋ΔHJUϦϙδτϦ @QBUDI @QBUDI

Slide 4

Slide 4 text

ޙഐ͘Μʮ͑ʔʁফ͢ΜͰ͢ ͔ʔʁԿ͔ා͍ͬ͢oldͰ͍͍ Ͱ͔͢ʔʁʯ

Slide 5

Slide 5 text

΅͘ʮGit͕֮͑ͯͯ͘ΕΔ͔ Βʂʂʂʂʂʂoldͱ͔΍Ί Ζʂʂʂʂʂʂʂʂʂʂʯ

Slide 6

Slide 6 text

ͳΜͱ͔खॱॻ_draft.docx

Slide 7

Slide 7 text

΅͘ʮdraft͸ϒϥϯν੾ͬͯ ΍ΕΑʂʂʂʂʂͬ͞͞ͱ rename͠Ζʂʂʂʂʂʯ

Slide 8

Slide 8 text

νʔϜ಺ͷGitྗ޲্͕՝୊ • Git͸ϑΝΠϧαʔό͡Όͳ͍ʂʂʂ • master௚push΍ΊΖʂʂʂ • खॱॻϨϏϡʔϓϩηεΛMRͰ΍Γ͍ͨɻɻ • ->ͭ·Γdiff͕͏·͘ग़ͳ͍WordΛ͜Ζ͢

Slide 9

Slide 9 text

$ git init > Initialized empty Git repository in /Users/take/ gitlab/.git/

Slide 10

Slide 10 text

$ ls .git > HEAD config description hooks info objects refs

Slide 11

Slide 11 text

.gitɺ͋Γ·͢Ͷʁ

Slide 12

Slide 12 text

.gitɺ͋Γ·͢Α

Slide 13

Slide 13 text

.git • Git͸͢΂ͯͷ؅ཧ৘ใΛ.gitҎԼʹू໿ • .gitͷதΛݟ͍ͯ͘͜ͱͰɺͲ͏΍ͬͯόʔ δϣϯ؅ཧΛ࣮ݱ͍͔ͯ͘͠ݟ͍ͯ͘

Slide 14

Slide 14 text

gitͷΦϒδΣΫτ CMPC ϑΝΠϧͷσʔλ USFF CMPC΁ͷࢀরͱɺ ֊૚෼ͷσΟϨΫτϦ৘ใ DPNNJU มߋ࣌ͷϝλσʔλͱɺ USFF΁ͷࢀর UBH DPNNJU΁ͷࢀর

Slide 15

Slide 15 text

gitͷΦϒδΣΫτ GitӳจϚχϡΞϧΛಡΉͨΊͷ༧උ஌ࣝ
 http://tokkonopapa.github.io/blog/2012/01/17/prior-knowledge-for-git-manual/

Slide 16

Slide 16 text

ςΩετϑΝΠϧͷ৔߹ $ echo "hello git" > hello_git.txt $ git add hello_git.txt $ git commit -m "hello git” [master (root-commit) aaa6ce7] hello git 1 file changed, 1 insertion(+) create mode 100644 git_test/hello_git.txt > Ҏ߱͸σϞͰʂ

Slide 17

Slide 17 text

όΠφϦϑΝΠϧͷ৔߹ ը૾ϑΝΠϧͷมߋ > Ҏ߱͸σϞͰʂ https://pixlr.com/editor/

Slide 18

Slide 18 text

εφοϓγϣοτ΍Μʂ ࠩ෼؅ཧ͡Όͳ͍΍Μʂ

Slide 19

Slide 19 text

git gc

Slide 20

Slide 20 text

git-gcͱpackfile • git-gcʹΑΓطଘͷΦϒδΣΫτ͸࡟আ͞Εɺ pack-*.idxͱpack-*.packϑΝΠϧ͕ੜ੒ • ͨͿΜ͜͜Ͱdeltaѹॖͯ͠Δ

Slide 21

Slide 21 text

େ༰ྔϑΝΠϧΛߋ৽ͯ͠ΈΔ $ sec 1 10000000 > sec.txt $ git gc Counting objects: 18, done. Delta compression using up to 4 threads. Compressing objects: 100% (14/14), done. Writing objects: 100% (18/18), done. Total 18 (delta 3), reused 11 (delta 0) > Ҏ߱͸σϞͰʂ

Slide 22

Slide 22 text

όΠφϦϑΝΠϧͷԿ͕μϝʁ • ୯ʹdiff͕ݟΕͳ͍ • merge࣌ʹconflict͢Δͱࢮ͵ • ࠩ෼͕ଟ͘ग़ΔՄೳੑ͕͋ΔͷͰɺpackʹΑ Δѹॖޮ཰͕ѱ͍

Slide 23

Slide 23 text

·ͱΊ • ຊ౰ʹͯ͠͸͍͚ͳ͍ͷ͸ʮڊେόΠφϧϑΝΠϧʯ ͷadd • -> Git LFS΁Ͳ͏ͧ • commit͸εφοϓγϣοτ(blog)Λੜ੒͠ɺpackͰ ࠩ෼อଘʹΑΔѹॖ • ͦΕҎ֎͸શͯࢀরͷϦϨʔ

Slide 24

Slide 24 text

͓·͚ɿWord͸όΠφϦͱ͍ ͏Θ͚Ͱ͸ͳ͍ • Wordͷத਎͸zip͞Εͨxml • ͔ͩΒgitͰdiffͱΔͱԿ͔͠Βݟ͑Δ • ࢀߟɿWord͞Μ͸ࠓ೔΋͓͔ͭΕͰ͢ • http://qiita.com/kaityo256/items/ c15889dbb7acb2632c6e

Slide 25

Slide 25 text

Reference • ΤϯδχΞͷͨΊͷGitͷڭՊॻʦ্ڃฤʧ Git಺෦ͷ࢓૊ΈΛཧղ͢Δ • https://www.amazon.co.jp/exec/obidos/ASIN/B01AAIN85K/ takeshe11-22/ • ʮΤϯδχΞͷͨΊͷgitڭՊॻʯ͔Βgitͷ಺෦ߏ଄ΛֶͿɹ࣮ફฤͦͷ1 • http://take-she12.hatenablog.com/entry/2017/08/10/120000 • ʮΤϯδχΞͷͨΊͷgitڭՊॻʯ͔Βgitͷ಺෦ߏ଄ΛֶͿɹ࣮ફฤͦͷ2 • http://take-she12.hatenablog.com/entry/2017/08/12/120000