これからはじめるGit

pull commit merge checkout branch stash push add diff status
log reset revert rebase rm stash commit diff merge log add checkout pull push commit ޿ౡϑϩϯτΤϯυษڧձ7PM ʰ͜Ε͔Β͸͡ΊΔ(JUʱ

ର৅ • Gitͬͯͳʹʁ • Git࢖ͬͯΔ͚Ͳɺ͏·͘࢖͑ͯΔ͔Θ͔Βͳ͍ • GitΛGUIͰ࢖͍ͬͯΔ͕ཪͰԿ͕͓͖ͯΔ͔Θ͔Βͳ͍ • ίϯϑϦΫτ͕ى͖ͨ࣌ʹͲ͏͍͍͔ͯ͠Θ͔Βͳ͍

ϑΝΠϧͷ؅ཧͲ͏ͯ͠·͔͢ʁ

Α͋͘ΔϑΝΠϧͷ؅ཧ ఏҊॻ.txt ఏҊॻ2.txt ৽ఏҊॻ.txt ఏҊॻ20220521.txt ఏҊॻ20220521-2.txt γϯɾఏҊॻ.txt

ͲΕ͕࠷৽͔Θ͔Βͳ͍ ͍ͭɺ୭͕ɺͲ͜Λهड़͠ํΘ͔Βͳ͍

ͦΜͳͱ͖Git͕͋Ε͹

Gitͱ͸

Gitͱ͸ • ιʔείʔυͳͲͷมߋཤྺΛه࿥ɾ௥੻͢ΔͨΊͷ෼ࢄܕ όʔδϣϯ؅ཧγεςϜ • LinuxΧʔωϧͷιʔείʔυ؅ཧ༻ʹϦʔφεɾτʔόϧζ ʹΑͬͯ։ൃ͞Εͨɻ

GitͷϝϦοτ • มߋͷཤྺ • ࠩ෼ͷൺֱ • ཤྺ͔Βͷ෮ݩ • ෳ਺ͷมߋΛ౷߹ ఏҊॻΛ࡞੒
ϓϥϯ1Λ௥Ճ ϓϥϯ1ͷݟੵ΋ΓΛ௥Ճ ϓϥϯ2Λ௥Ճ ϓϥϯ1Λमਖ਼ ϓϥϯ2ͷݟੵ΋ΓΛ௥Ճ ϓϥϯ1ͷݟੵ΋ΓΛमਖ਼ 2022.05.21 15:25 2022.05.20 22:46 2022.05.20 20:10 2022.05.19 10:43 2022.05.19 16:08 2022.05.18 19:27 2022.05.18 10:00 Ҫ্ ࡔຊ Ҫ্ ࡔຊ Ҫ্ Ҫ্ Ҫ্

ετʔϦʔʹԊͬͯ GitͷίϚϯυ૯෮श

͔͜͜Βͷૢ࡞͸

ίϚϯυϓϩϯϓτɺλʔϛφϧ౳

·ͣ͸GitΛ࢖͏४උ

$ git con fi g --global user.name "XXXX" • Ϣʔβʔ໊Λઃఆ͢Δ
• ୭͕ίϛοτͨ͠΋ͷ͔Θ͔ΔΑ͏ʹ $ git con fi g --global user.email "[email protected]" • ϝʔϧΞυϨεΛઃఆ͢Δ • SaaSͰ͸ϝʔϧΞυϨεʹඥ͍ͮͯΞΠίϯͳͲ͕දࣔ͞ΕΔ

ϓϩδΣΫτͷσΟϨΫτϦΛ࡞Γ·͢ $ mkdir git-project $ cd git-project

index.htmlΛ࡞੒͠·͢ <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link rel="stylesheet"
href=""> <title>index</title> </head> <body> </body> </html> JOEFYIUNM

Ͱ͸ɺϦϙδτϦͷॳظԽΛ͠·͠ΐ͏

ϦϙδτϦͱ͸ • ϑΝΠϧ΍σΟϨΫτϦͷঢ়ଶΛه࿥͢Δ৔ॴ • อଘ͞Εͨঢ়ଶ͸ɺ಺༰ͷมߋཤྺͱͯ֨͠ೲ͞ΕΔ ϦϞʔτϦϙδτϦ • ઐ༻ͷαʔόʹ഑ஔͯ͠ෳ਺ਓͰڞ༗͢ΔͨΊͷϦϙδτϦ ϩʔΧϧϦϙδτϦ •
ݸʑਓͷϩʔΧϧ؀ڥʹ͋ΔϦϙδτϦ

ϦϞʔτϦϙδτϦ ϩʔΧϧϦϙδτϦ ϩʔΧϧϦϙδτϦ ϩʔΧϧϦϙδτϦ

$ git init • GitͷͰϦϙδτϦΛ࡞੒͢Δढจ • طଘͷϓϩδΣΫτΛGitϦϙδτϦʹม׵͢Δ • ۭͷ৽نϦϙδτϦΛ࡞੒ͯ͠ॳظԽ͢Δ •
init͢Δͱ.git͕࡞੒͞ΕΔ   ※ফ͢ͱࢮ͵

੍࡞ͨ͠index.htmlͷมߋΛొ࿥͠Α͏

$ git add • ίϛοτର৅ϑΝΠϧΛΠϯσοΫεʹొ࿥͢Δ • ݸʑͷϑΝΠϧͷΞοϓσʔτ಺༰Λ࣍ճίϛοτର৅ʹ͢Δ

$ git add . • ݱࡏͷϫʔΩϯάπϦʔΛશͯΠϯσοΫεʹొ࿥͢Δ $ git add index.html
• ಛఆͷϑΝΠϧΛࢦఆ͢Δ͜ͱ΋Ͱ͖Δ

ϦϙδτϦͷঢ়ଶΛݟͯΈΑ͏

$ git status • ϫʔΩϯάπϦʔʹ͋ΔϑΝΠϧͷঢ়ଶΛදࣔ͢Δ On branch main No commits
yet Changes to be committed: (use "git rm --cached < fi le>..." to unstage) new fi le: index.html

On branch main No commits yet Changes to be committed:
(use "git rm --cached < fi le>..." to unstage) new fi le: index.html Untracked fi les: (use "git add < fi le>..." to include in what will be committed) index2.html addͯ͠ͳ͍ϑΝΠϧ͕͋Δ৔߹

$ git status -s • γϣʔτϑΥʔϚοτͰදࣔ M index.html M index2.html

$ git status -sb • γϣʔτϑΥʔϚοτͰ΋ϒϥϯνͱ௥੻৘ใΛදࣔ ## main M index.html
M index2.html

ΠϯσοΫεͨ͠มߋΛ ϦϙδτϦʹొ࿥ͯ͠ΈΑ͏

$ git commit • ΠϯσοΫεʹ௥Ճͨ͠มߋΛϦϙδτϦʹอଘ͢Δ

ʲ͜͜ʹϝοηʔδΛॻ͘ʳ # Please enter the commit message for your changes.
Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch main # # Initial commit # # Changes to be committed: # new fi le: index.html ίϛοτϝοηʔδΛೖྗ͢Δը໘͕։͘ viͷૢ࡞͕ඞཁɻΠϯαʔτϞʔυ͸ʮiʯɺίϚϯυϞʔυ͸ʮescʯɺอଘ͸ίϚϯυϞʔυͰʮ:wqʯɺอଘͤͣด͡Δ৔߹͸ʮ:q!ʯ

$ git commit -m “index.htmlΛ௥Ճ” • -mΦϓγϣϯ • ॻ͔ΕͨςΩετΛίϛοτϝοηʔδͱͯ͠࢖༻͢Δ

ΠϯσοΫεɾϫʔΩϯάπϦʔɾHEADͱ͸ ϫʔΩϯάπϦʔ • Ϣʔβʔ͕࡞ۀதͷϑΝΠϧ͕͋Δ৔ॴ ΠϯσοΫε • ίϛοτର৅ϑΝΠϧΛొ࿥͢Δ৔ॴ HEAD • ϦϙδτϦͷ࠷৽ίϛοτΛࣔࣝ͢ผࢠ

A B C ϫʔΩϯάπϦʔ ΠϯσοΫε )&"%

A B C ϫʔΩϯάπϦʔ ΠϯσοΫε )&"% ϑΝΠϧͷมߋ

A B C ΠϯσοΫε )&"% ϫʔΩϯάπϦʔ ϑΝΠϧͷมߋ

A B C ΠϯσοΫε )&"% ϫʔΩϯάπϦʔ git add

A B C )&"% ϫʔΩϯάπϦʔ ΠϯσοΫε git add

A B C )&"% ϫʔΩϯάπϦʔ ΠϯσοΫε git commit

A B C ϫʔΩϯάπϦʔ ΠϯσοΫε )&"% git commit

ίϛοτͰ͖͔ͨݟͯΈΑ͏

$ git log • ίϛοτϩάΛදࣔ͢Δ commit 6f0165b3aa719d4ede12ade9d61e3b491d0c795d (HEAD -> main)
Author: XXXX <[email protected]> Date: Sun May 15 00:00:24 2022 +0900 “index.htmlΛ௥Ճ”

index.htmlʹh1Λ௥Ճ <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link rel="stylesheet"
href=""> <title>index</title> </head> <body> <h1>index</h1> </body> </html> JOEFYIUNM

มߋΛίϛοτ͠·͠ΐ͏ $ git add index.html $ git commit -m “h2Λ௥Ճ”

͓ͬͱɺίϛοτϝοηʔδΛؒҧ͑ͨ

$ git log $ git log commit 6156b13a243e2121ef0f054316915795b22e5ded (HEAD ->
main) Author: XXXX <[email protected]> Date: Sun May 15 00:15:34 2022 +0900 h2Λ௥Ճ commit 6f0165b3aa719d4ede12ade9d61e3b491d0c795d Author: XXXX <[email protected]> Date: Sun May 15 00:00:24 2022 +0900 “index.htmlΛ௥Ճ”

$ git commit --amend • ௚લͷίϛοτΛमਖ਼͢Δ • git commitͱಉ͡Α͏ͳը໘͕։͘ h2Λ௥Ճ
# Date: Fri May 13 23:13:05 2022 # # On branch main # Changes to be committed: # modi fi ed: index.html h1Λ௥Ճ # Date: Fri May 13 23:13:05 2022 # # On branch main # Changes to be committed: # modi fi ed: index.html

$ git commit —amend -m “h1Λ௥Ճ” • commitͱҰॹͰ-mΛ͚ͭΔͱίϛοτϝοηʔδΛ   ্ॻ͖Ͱ͖Δ

main) Author: XXXX <[email protected]> Date: Sun May 15 00:15:34 2022 +0900 h1Λ௥Ճ commit 6f0165b3aa719d4ede12ade9d61e3b491d0c795d Author: XXXX <[email protected]> Date: Sun May 15 00:00:24 2022 +0900 “index.htmlΛ௥Ճ”

index2.htmlͱindex3.htmlΛ࡞੒͠·͢ $ cp index.html index2.html $ cp index.html index3.html

ίϐʔͨ͠ϑΝΠϧΛadd͢Δ $ git add . $ git status -sb ##
main A index2.html A index3.html

1ϑΝΠϧͣͭίϛοτ͔ͨͬͨ͠

$ git reset • ΠϯσοΫε͔Βશͯ࡟আ͢Δ • ϫʔΩϯάπϦʔ͸ӨڹΛड͚ͳ͍(มߋ͸ফ͑ͳ͍) $ git reset
index3.html • ಛఆͷϑΝΠϧΛΠϯσοΫε͔Β࡟আ͢Δ

ΠϯσοΫε͔Βindex3.htmlΛ࡟আ͢Δ $ git reset index3.html $ git status -sb ##
main A index2.html ?? index3.html

index2.htmlΛίϛοτ $ git commit -m “index2.htmlΛ௥Ճ”

index3.htmlΛίϛοτ $ git add . $ git commit -m “index3.htmlΛ௥Ճ”

index2.htmlʹ௥ه

index2.htmlʹ௥ه <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link rel="stylesheet"
href=""> <title>index3</title> </head> <body> <h1>index3</h1> </body> </html> JOEFYIUNM

index2.htmlΛίϛοτ $ git add . $ git commit -m “index2.htmlʹ௥ه”

͓ͬͱɺindex2.htmlͳͷʹ index3ͱ௥هͯ͠͠·ͬͨ

$ git reset ʲΦϓγϣϯʳ ʲίϛοτIDʳ • HEADͷҐஔɾΠϯσοΫεɾϫʔΩϯάπϦʔΛ   ͲΕ͔·ͨ͸શͯΛʲίϛοτIDʳ·Ͱ໭͢

A B C ϫʔΩϯάπϦʔ ΠϯσοΫε )&"% git reset --hard A

A B C ϫʔΩϯάπϦʔ ΠϯσοΫε )&"% git reset --mixed A

A B C ϫʔΩϯάπϦʔ git reset --mixed A ΠϯσοΫε )&"%

A B C ϫʔΩϯάπϦʔ ΠϯσοΫε )&"% git reset --soft A

$ git reset • ΠϯσοΫε͔Βશͯ࡟আ͢Δ • ϫʔΩϯάπϦʔ͸ӨڹΛड͚ͳ͍(มߋ͸ফ͑ͳ͍) $ git reset
index3.html • ಛఆͷϑΝΠϧΛΠϯσοΫε͔Β࡟আ͢Δ $ git reset --mixed HEAD

໭͢஍఺ͷίϛοτIDΛௐ΂Δ

main) Author: XXXX <[email protected]> Date: Sun May 15 00:15:34 2022 +0900 index2.htmlʹ௥ه commit 6f0165b3aa719d4ede12ade9d61e3b491d0c795d Author: XXXX <[email protected]> Date: Sun May 15 00:00:24 2022 +0900 index3.htmlΛ௥Ճ

$ git reset --mixed 6f0165b3aa719(ུ) • 6f0165b3aa719(ུ)·ͰɺΠϯσοΫεɺHEADΛ໭͢ • มߋ͸ͦͷ··

࠶౓index2.htmlʹ௥ه <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link rel="stylesheet"
href=""> <title>index2</title> </head> <body> <h1>index2</h1> </body> </html> JOEFYIUNM

࠶౓index2.htmlΛίϛοτ $ git add . $ git commit -m “index2.htmlʹͪΌΜͱ௥ه”

index.htmlΛߋ৽ͭͭ͠ɺ index2.htmlͰ࣮ݧ͍ͨ͠

$ git branch dev • ຊྲྀ͔Β෼ذ͠ɺຊྲྀͷ։ൃΛअຐ͢Δ͜ͱͳ͘࡞ۀΛଓ͚Δػೳ A B C main

$ git branch dev • ຊྲྀ͔Β෼ذ͠ɺຊྲྀͷ։ൃΛअຐ͢Δ͜ͱͳ͘࡞ۀΛଓ͚Δػೳ A B C D
main dev

ϒϥϯνͱ͸ • ཤྺΛࢬ෼͔Εͤͯ͞ه࿥͍ͯ͘͠ • ϒϥϯνͰͷมߋ͸౷߹͞ΕΔ·ͰଞϒϥϯνʹӨڹ͠ͳ͍͠ ͞Εͳ͍ A B C D
main dev

͜Ε͚ͩͩͱdevϒϥϯνΛ ࡞͚ͬͨͩͳͷͰɺ devϒϥϯνʹҠಈͯ͠࡞ۀ͢Δ

$ git switch dev • ࢦఆ͞Εͨϒϥϯνʹ੾Γସ͑Δ A B C D
main dev ࡞ۀϒϥϯν

$ git switch -c dev • ϒϥϯνΛ࡞੒ͯ͠Ҡಈ͢Δ A B C
main ࡞ۀϒϥϯν

$ git switch -c dev • ϒϥϯνΛ࡞੒ͯ͠Ҡಈ͢Δ A B C
D main dev ࡞ۀϒϥϯν

index.htmlʹpΛ௥Ճ <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link rel="stylesheet"
href=""> <title>index</title> </head> <body> <h1>index</h1> <p>Hello index</p> </body> </html> JOEFYIUNM

index.htmlΛίϛοτ $ git add . $ git commit -m “pΛ௥ه”

࣮ݧ͸੒ޭͨ͠ͷͰɺ ݩͷϒϥϯνʹ΋มߋΛదԠͤ͞Α͏

$ git merge dev • ಠཱͨ͠ෳ਺ͷϒϥϯνΛͻͱͭͷϒϥϯνʹ౷߹͢Δ • ݱࡏͷϒϥϯν΁ͷϚʔδΛߦ͏ • ผͷϒϥϯνͷมߋΛϚʔδ͞Εͨଆͷཤྺʹ࣋ͬͯ͘Δ͜ͱΛ
fast-forward(ૣૹΓ)ϚʔδͱݺͿ A B C main dev

$ git merge --no-ff dev • no-ffΦϓγϣϯΛ͚ͭΔ͜ͱͰɺ͋͑ͯfast-forward(ૣૹΓ) ϚʔδΛͤͣɺϚʔδͨ͠ཤྺΛ࢒͢ A B
C main dev D Ϛʔδίϛοτ

A B D C main dev E Ϛʔδ͞ΕΔଆͷϒϥϯνʹ΋มߋ͕͋ͬ ͨ৔߹͸ɺϚʔδίϛοτ͕࡞ΒΕΔ Ϛʔδίϛοτ

devΛmainʹϚʔδ $ git switch main $ git merge --no-ff dev

index.htmlΛݟͯΈΔͱ devͰߦͬͨมߋ͕దԠ͞Ε͍ͯΔ <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link
rel="stylesheet" href=""> <title>index</title> </head> <body> <h1>index</h1> <p>Hello index</p> </body> </html> JOEFYIUNM

͜͜Ͱ৽ͨͳϝϯόʔ͕δϣΠϯ͠·ͨ͠

ͯ͞ɺͲ͏΍ͬͯσʔλΛڞ༗͠Α͏

ϦϞʔτϦϙδτϦ ϩʔΧϧϦϙδτϦ ϩʔΧϧϦϙδτϦ ϩʔΧϧϦϙδτϦ

ϦϞʔτϦϙδτϦΛ࡞ͬͨΒɺ ཤྺΛૹΓ·͠ΐ͏

ϦϙδτϦʹϦϞʔτϦϙδτϦΛ ௥Ճ͠·͠ΐ͏

$ git remote • ଞͷϦϙδτϦͱͷ઀ଓͷ࡞੒ɺ಺༰֬ೝɺ࡟আΛߦ͏ $ git remote add ʲ໊લʳʲϦϙδτϦͷURLʳ
• ໊લ͸೚ҙ • γϣʔτΧοτ໊ͷΑ͏ʹ࢖͏

ϦϞʔτϦϙδτϦΛొ࿥ $ git remote add origin [email protected]:XXX/git- project.git

ϦϞʔτϦϙδτϦʹ ཤྺΛૹΓ·͠ΐ͏

$ git push • ϦϞʔτϦϙδτϦ΁ͷॻ͖ࠐΈΛߦ͏ $ git pushʲ໊લʳʲϒϥϯν໊ʳ • ໊લ͸git
remote add ͨ࣌͠ʹ໊͚ͭͨલ • ೚ҙͷϒϥϯνͷΈpushͰ͖Δ

ϦϞʔτϦϙδτϦʹཤྺΛૹΔ $ git push -u origin main

$ git push -u origin main • -uΦϓγϣϯ • --set-upstreamͱಉҙ
• ଞͷϒϥϯν͸mainϒϥϯν͔Β෼ذ(্ྲྀϒϥϯν)ͱͯ͠ઃఆ ͢Δ $ git push

νʔϜʹՃΘͬͨਓ͸ϦϞʔτϦϙδτϦ ͔Β࠷৽ͷཤྺΛऔ͖ͬͯ·͢ɻ

$ git clone • ϦϙδτϦͷΫϩʔϯΛ࡞੒͢Δ

ϩʔΧϧʹϦϞʔτϦϙδτϦͷ ΫϩʔϯΛ࡞੒͢Δ $ git clone https://github.com/XXX/ git-project.git

CSSΛಡΜͰͳ͍ͷͰಡΈࠐ΋͏ <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link rel="stylesheet"
href=“css/style.css”> <title>index</title> </head> <body> <h1>index</h1> <p>Hello index</p> </body> </html> JOEFYIUNM

index.htmlΛίϛοτ $ git add . $ git commit -m “CSSΛಡΈࠐΈ”
$ git push

Ұํͦͷ͜Ζ

λΠτϧΛमਖ਼͠Α͏ <!DOCTYPE html> <html lang="ja"> <head> <meta charset="UTF-8"> <link rel="stylesheet"
href=“”> <title>Hello index</title> </head> <body> <h1>index</h1> <p>Hello index</p> </body> </html> JOEFYIUNM

index.htmlΛίϛοτ $ git add . $ git commit -m “λΠτϧΛฤू”

มߋ͕͋ͬͨΒ͍͠ͷͰ ࠷৽Λམͱͯ͜͠Α͏

$ git pull • ϦϞʔτϦϙδτϦߋ৽ࠩ෼ΛϩʔΧϧϦϙδτϦʹ࣋ͬͯ͘Δ warning: Pulling without specifying how
to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: git con fi g pull.rebase false # merge (the default strategy) git con fi g pull.rebase true # rebase git con fi g pull.ff only # fast-forward only Git2.27.0͔Β git pull ͚ͩͩͱ Warning͕ग़ΔΑ͏ʹͳΓ·ͨ͠

$ git pull

Auto-merging index.html CONFLICT (content): Merge con fl ict in index.html
Automatic merge failed; fi x con fl icts and then commit the result.

ίϯϑϦΫτͱ͸ • 2ͭͷϒϥϯνΛ౷߹͢Δ৔߹ʹ͸ɺίϯϑϦΫτ͕ى͜Δ৔ ߹͕͋Δ • Ϛʔδ͢Δࡍʹ྆ํͷϒϥϯνͰಉ͡ߦΛฤू͍ͯ͠Δ৔߹͸ ίϯϑϦΫτ͕ൃੜ͢ΔͨΊɺGit͸ࣗಈతʹϚʔδΛͤͣʹ ։ൃऀࣗ਎ʹίϯϑϦΫτͷղফΛٻΊΔ

3 <head> 4 <meta charset="UTF-8"> 5 <<<<<<< HEAD 6 <link
rel="stylesheet" href="css/style.css"> 7 <title>index</title> 8 ======= 9 <link rel="stylesheet" href=""> 10 <title>Hello index</title> 11 >>>>>>> 3be019ca9aeae74f4f3b876e8d9c7b61e5ba9902 12 </head> JOEFYIUNM

3 <head> 4 <meta charset="UTF-8"> 5 <link rel="stylesheet" href="css/style.css"> 6
<title>Hello index</title> 7 </head> JOEFYIUNM

ίϯϑϦΫτ͕ղফͨ͠Β ίϛοτ͠Α͏ $ git add . $ git commit Merge
branch 'dev' of github.com:takanashi66/git-project into dev # Con fl icts: # index.html # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again.

߄ͯͣରॲ͠Α͏

pullͯ͘͠Δલʹ֬ೝ΋Ͱ͖Δ

$ git fetch • ϦϞʔτϦϙδτϦͷ࠷৽ͷཤྺͷऔಘ͚ͩΛߦ͏ • ͜ͷͱ͖ϩʔΧϧϦϙδτϦʹࠩ෼͸దԠ͞Εͳ͍ • ίϛοτ͸ɺ໊લͷແ͍ϒϥϯνͱͯ͠औΓࠐ·ΕΔ •
FETCH_HEADͱ͍͏໊લͰ֬ೝ͢Δ͜ͱ͕Ͱ͖Δ A B C D dev FETCH_HEA

$ git diff FETCH_HEAD • 2 ͭͷσʔλΛऔಘͯͦ͠ΕΒͷมߋΛൺֱ͢Δ • ର৅ͷσʔλ͸ίϛοτɺϒϥϯνɺϑΝΠϧͳͲ

diff --git a/index.html b/index.html index 12f6444..84a776d 100644 --- a/index.html +++
b/index.html @@ -2,8 +2,8 @@ <html lang="ja"> <head> <meta charset="UTF-8"> - <link rel="stylesheet" href="css/style.css"> - <title>index</title> + <link rel="stylesheet" href=""> + <title>Hello index</title> </head> <body> <h1>index</h1>

ࠓճ঺հͰ͖ͳ͔ͬͨίϚϯυ

$ git show • 1ͭҎ্ͷΦϒδΣΫτʢϒϩϒɺπϦʔɺλάɺ͓ΑͼίϛοτʣΛදࣔ $ git revert • ίϛοτʹΑͬͯՃ͑ΒΕͨมߋΛଧͪফ͢

$ git stash • ϫʔΩϯάπϦʔͷ಺༰ΛҰ࣌తʹୀආ͢Δ $ git stash save “ϝοηʔδ”
• ϫʔΩϯάπϦʔͷ಺༰ΛϝοηʔδΛ͚ͭͯҰ࣌తʹୀආ͢Δ $ git stash pop • Ұ࣌తʹୀආͨ͠มߋΛϫʔΩϯάπϦʔʹదԠ͢Δ and more …

·ͱΊ

·ͱΊ • ·ͣ͸ɺ͜ΜͳίϚϯυ͕͋ΔΜͩͱ஌Δ͜ͱ͕େࣄ • εϥΠυ͸ޙ೔ެ։͠·͢ • ࣍͸࣮ࡍʹखಈ͔ͯ͠Έ͍ͯͩ͘͞

͝੩ௌ͋Γ͕ͱ͏͍͟͝·ͨ͠

͓·͚ git reset --hardͰ໭Γ͗ͯ͢͠·ͬͨ৔߹ͷରॲ๏ * 27561a6 - (HEAD -> main)
add p (30 seconds ago) * 831a227 - add h1 (75 seconds ago) * dbe6a2b - add index (2 minutes ago) ͜͜·Ͱ໭Γ͍ͨ

͓·͚ git reset --hardͰ໭Γ͗ͯ͢͠·ͬͨ৔߹ͷରॲ๏ * 27561a6 - (HEAD -> main)
add p (30 seconds ago) * 831a227 - add h1 (75 seconds ago) * dbe6a2b - add index (2 minutes ago) ؒҧͬͯͬͪ͜Λ ࢦఆͯ͠͠·ͬͨ $ git reset --hard dbe6a2b

͓·͚ git reset --hardͰ໭Γ͗ͯ͢͠·ͬͨ৔߹ͷରॲ๏ * dbe6a2b - add index (2
minutes ago) ໭Γ͗ͯ͢ Ҏ͕߱ফ͑ͯ͠·ͬͨ $ git reset --hard dbe6a2b

͓·͚ git reset --hardͰ໭Γ͗ͯ͢͠·ͬͨ৔߹ͷରॲ๏ $ git re fl og -n
4 * dbe6a2b (HEAD -> main) HEAD@{0}: reset: moving to dbe6a2b * 27561a6 HEAD@{1}: commit (amend): add p * 52ab2f9 HEAD@{2}: commit: add h1 * 831a227 HEAD@{3}: commit: add h1 ফ͑ͯ͠·ͬͨ ίϛοτID͕֬ೝͰ͖Δ ࠷ޙͷ4͸೚ҙͷ਺ࣈɺ5ͳΒաڈͷཤྺ͕5ݸݟΕΔ amendͯ͠Δͷ͸ؾʹ͠ͳ͍Ͱ….

͓·͚ git reset --hardͰ໭Γ͗ͯ͢͠·ͬͨ৔߹ͷରॲ๏ $ git reset --hard 831a227 *
dbe6a2b (HEAD -> main) HEAD@{0}: reset: moving to dbe6a2b * 27561a6 HEAD@{1}: commit (amend): add p * 52ab2f9 HEAD@{2}: commit: add h1 * 831a227 HEAD@{3}: commit: add h1 վΊͯࢦఆͷҐஔ·Ͱreset͢͢Ε͹͍͍

これからはじめるGit

これからはじめるGit

More Decks by 井上拓

Other Decks in Technology

Featured

Transcript