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
74
1
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
Jujutsuを使うモチベーション
thirdlf03
August 23, 2025
More Decks by thirdlf03
See All by thirdlf03
test
thirdlf03
0
15
単語で読み解くクラウドネイティブ会議
thirdlf03
1
64
PHPでGitを実装してみる
thirdlf03
0
140
実務経験なし、資格なしの学生が、AWSとAlexaをフルで活用し福岡の地域課題解決に挑んでみた話
thirdlf03
3
240
とにかく楽して登壇資料を作る/EasyPresentationSlides
thirdlf03
2
240
学生のうちにいろんなカンファレンスへ行こう!
thirdlf03
2
400
MCP登場から約1年!あの頃と今、何が変わった? / MCP One Year Later
thirdlf03
0
180
cursorで実践するContext Engineering
thirdlf03
1
66
Cloudflare Containers使ってみた
thirdlf03
1
50
Featured
See All Featured
Exploring the relationship between traditional SERPs and Gen AI search
raygrieselhuber
PRO
2
4.2k
The AI Search Optimization Roadmap by Aleyda Solis
aleyda
1
6.1k
[SF Ruby Conf 2025] Rails X
palkan
2
1.3k
Fireside Chat
paigeccino
42
4k
The untapped power of vector embeddings
frankvandijk
2
1.8k
How to make the Groovebox
asonas
2
2.3k
VelocityConf: Rendering Performance Case Studies
addyosmani
331
25k
Become a Pro
speakerdeck
PRO
31
6.2k
Designing for humans not robots
tammielis
254
26k
The AI Revolution Will Not Be Monopolized: How open-source beats economies of scale, even for LLMs
inesmontani
PRO
3
3.7k
Max Prin - Stacking Signals: How International SEO Comes Together (And Falls Apart)
techseoconnect
PRO
0
420
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
508
140k
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ͱซ༻Ͱࢼͯ͠Έͯʂʂ