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
Jujutsuを使うモチベーション
Search
thirdlf03
August 23, 2025
79
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
19
単語で読み解くクラウドネイティブ会議
thirdlf03
1
72
PHPでGitを実装してみる
thirdlf03
0
160
実務経験なし、資格なしの学生が、AWSとAlexaをフルで活用し福岡の地域課題解決に挑んでみた話
thirdlf03
3
250
とにかく楽して登壇資料を作る/EasyPresentationSlides
thirdlf03
2
250
学生のうちにいろんなカンファレンスへ行こう!
thirdlf03
2
420
MCP登場から約1年!あの頃と今、何が変わった? / MCP One Year Later
thirdlf03
0
180
cursorで実践するContext Engineering
thirdlf03
1
71
Cloudflare Containers使ってみた
thirdlf03
1
54
Featured
See All Featured
Build your cross-platform service in a week with App Engine
jlugia
234
19k
Dominate Local Search Results - an insider guide to GBP, reviews, and Local SEO
greggifford
PRO
0
330
Testing 201, or: Great Expectations
jmmastey
46
8.3k
How To Speak Unicorn (iThemes Webinar)
marktimemedia
1
580
Winning Ecommerce Organic Search in an AI Era - #searchnstuff2025
aleyda
2
2.1k
More Than Pixels: Becoming A User Experience Designer
marktimemedia
3
520
Ecommerce SEO: The Keys for Success Now & Beyond - #SERPConf2024
aleyda
1
2.1k
[RailsConf 2023] Rails as a piece of cake
palkan
59
7k
コードの90%をAIが書く世界で何が待っているのか / What awaits us in a world where 90% of the code is written by AI
rkaga
63
46k
Navigating Team Friction
lara
192
16k
Why Your Marketing Sucks and What You Can Do About It - Sophie Logan
marketingsoph
0
410
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
46
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ͱซ༻Ͱࢼͯ͠Έͯʂʂ