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
Jujutsuを使うモチベーション
Search
Sponsored
·
Your Podcast. Everywhere. Effortlessly.
Share. Educate. Inspire. Entertain. You do you. We'll handle the rest.
→
thirdlf03
August 23, 2025
1
47
Jujutsuを使うモチベーション
thirdlf03
August 23, 2025
Tweet
Share
More Decks by thirdlf03
See All by thirdlf03
実務経験なし、資格なしの学生が、AWSとAlexaをフルで活用し福岡の地域課題解決に挑んでみた話
thirdlf03
2
140
とにかく楽して登壇資料を作る/EasyPresentationSlides
thirdlf03
2
200
学生のうちにいろんなカンファレンスへ行こう!
thirdlf03
2
340
MCP登場から約1年!あの頃と今、何が変わった? / MCP One Year Later
thirdlf03
0
130
cursorで実践するContext Engineering
thirdlf03
1
47
Cloudflare Containers使ってみた
thirdlf03
1
32
uv + ruff + tyを使ったモダンな環境でdiscord bot作ってみよう(Genspark製)
thirdlf03
0
35
Workers-rs使ってみた
thirdlf03
0
20
プログラミングを教えるときに大切なこと
thirdlf03
0
22
Featured
See All Featured
Principles of Awesome APIs and How to Build Them.
keavy
128
17k
Measuring & Analyzing Core Web Vitals
bluesmoon
9
790
Embracing the Ebb and Flow
colly
88
5k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
333
22k
Hiding What from Whom? A Critical Review of the History of Programming languages for Music
tomoyanonymous
2
600
AI Search: Implications for SEO and How to Move Forward - #ShenzhenSEOConference
aleyda
1
1.2k
Navigating Team Friction
lara
192
16k
Designing for Timeless Needs
cassininazir
0
170
How People are Using Generative and Agentic AI to Supercharge Their Products, Projects, Services and Value Streams Today
helenjbeal
1
140
GitHub's CSS Performance
jonrohan
1032
470k
Balancing Empowerment & Direction
lara
5
1k
Typedesign – Prime Four
hannesfritz
42
3k
Transcript
JujutsuΛ͏Ϟνϕʔγϣϯ @thirdlf
ࣗݾհ • ໊લ: thirdlf(͞ͲΔ;) • झຯ: ϋοΧιϯɺϥΠϒ • ࠷ۙϨΠϠʔʹڵຯ͋Γ
GitΛͬͨ͜ͱ͋Δํ🙋
JujutsuͬͯVCSͬͯΔํ🙋 㕩ઓͷํͰͳ͍Ͱ͢
GitΛ͏Ϟνϕʔγϣϯ ͍ΖΜͳཧ༝͕͋ͬͯɺGitΛ͍ͬͯΔͱࢥ͏͕… Ұ൪ͷϞνϕʔγϣϯɺϑΝΠϧͷཤྺཧ(όʔδϣϯཧ)͍ͨ͠ ͔Βͩͱࢥ͍·͢ʂ
ͨͩɺgit logݟͨ࣌ʹ͜Μͳϩάʹ ͳͬͨܦݧ͋Γ·ͤΜ͔ʁ
… Ұ୴ίϛοτͨ͠ΓɺtypoͰίϛο τͨ͠Γ…
ଞʹGit͍ͬͯΔ࣌ʹ… • ίϯϑϦΫτىͬͯ͜࡞ۀ͕ࢭ·ͬͯ͠·ͬͨ • ίϛοτ࿙Ε • git resetrevertΛ࣮ߦ͢Δͷ͕ා͍ • ෳࡶͳཤྺฤू͕ԯ߷
ͦΜͳΈΛղܾͯ͘͠ΕΔͷ͕ JujutsuͰ͢ʂ
Jujutsuͱʁ JujutsuɺRustͷVCS ࡞ऀɺGoogleͷιϑτΣΞΤϯδχΞͰɺGoogleͷطଘͷVCS ʢPerforceɺPiperɺMercurialʣΛஔ͖͑ΔํͰ։ൃ͕ਐΊΒΕͯ ͍ΔΒ͍͠ɻ https://github.com/jj-vcs/jj
Jujutsuͷಛ • Gitͱޓੑ͕͋Δ • git addʹ͋ͨΔίϚϯυ͕ͳ͍ • Change ID •
ίϯϑϦΫτͰΤϥʔ͕ى͖ͳ͍ • ίϚϯυͷཤྺ͕Δ Jujutsuͷಛ
Gitͱޓੑ͕͋Δ GitHubͬͨΓɺGitͱซ༻ͨ͠ΓͰ͖Δ ➡νʔϜϝϯόʔGitɺࣗjjՄ ➡طଘͷϓϩδΣΫτΛঃʑʹjjʹҠߦͨ͠ΓͰ͖Δ
git addʹ͋ͨΔίϚϯυ͕ͳ͍ ϑΝΠϧ͕Ճ͞ΕͨΓɺมߋ͞ΕΔͱࣗಈͰ ➡ίϛοτ࿙Ε͕ͳ͘ͳΔ *.gitignoreͰର֎ʹͰ͖ͨΓɺjj splitͰίϛοτʹؚΊΔϑΝΠ ϧͳͲબΔ
Change ID JujutsuʹɺՄมͷCommit IDͱෆมͷChange ID͕ଘࡏ͢Δɻ zzzzzzzzͷ෦͕Change IDɺ00000000͕Commit ID
ίϯϑϦΫτͰΤϥʔ͕ى͖ͳ͍ ίϯϑϦΫτίϛοτͷதʹཧతͳঢ়ଶͱͯ͠ه͞ΕΔ
ίϚϯυͷཤྺ͕Δ jj op logͰίϚϯυͷϩά͕ݟΔ͜ͱ͕Ͱ͖Δ jj op undoͰҰͭલͷίϚϯυΛ࣮ߦ͢Δલͷঢ়ଶʹͬͨΓɺjj op restore opidࢦఆ͢ΔͱɺͦͷidͷίϚϯυΛߦͳ͏ͷঢ়ଶʹΔ͜ͱ
͕Ͱ͖Δ
None
JujutsuΛ͏Ϟνϕʔγϣϯ ͱʹ͔͘։ൃʹ಄Ͱ͖Δɻཤྺฤूා͘ͳ͍ʂ ➡ ࡞ۀ͢ΔखΛࢭΊͳ͍͍ͯ͘ʂʂʂʂʂ AIΛͬͨ։ൃͱ૬ੑ͕͍͍ ➡ jj workspaceͰ git workspaceͷΑ͏ͳ͜ͱ͕Ͱ͖ͨΓɺฒྻ։ൃ͍ͤͯ͞Δ࣌ʹίϯϑϦ
Ϋτ͕ى͖ͯޙ͔ΒղܾͰ͖Δʂʂ ʮෳͷGemini CLI͕ಉ࣌։ൃ͢Δڰؾ - Jujutsu͕࣮ݱ͢ΔAIΤʔδΣϯτڠௐͷ৽ੈքʯͱ ݕࡧͯ͠Έ͍ͯͩ͘͞
͖ͳίϚϯυ • jj log • jj edit • jj absorb
jj log σϑΥϧτͰάϥϑදࣔ͞ΕΔͷ͕ ͖
jj edit ࢦఆͨ͠Change ID or Commit IDʹ Ҡಈ͠ɺίϛοτΛฤू͢Δ͜ͱ͕ Ͱ͖Δ ࠓճɺippai
henkouΛׂ͍ͨ͠
ฤूޙ ฤूલ
jj absorb ͍͍ײ͡ʹϑΝΠϧͷมߋΛաڈͷίϛ οτʹऔΓࠐΜͰ͘ΕΔ ྫ͑ɺλΠϙϛεΛฤूͨ͠ޙɺ absorb͏ͱ࠷ޙͦͷϑΝΠϧΛมߋ͠ ͨίϛοτʹऔΓࠐΜͰ͘ΕΔ ➡ fi x
typoίϛοτͳͲΛ࡞Βͳ͍͍ͯ͘
·ͱΊ • Jujutsu͍͍ͧʔ • Gitͱซ༻Ͱࢼͯ͠Έͯʂʂ