Commit message will never die

$PNNJUNFTTBHFXJMMOFWFSEJF 4BU 3BJMTίϯτϦϏϡʔγϣϯ ͔ΒֶΜͩ (JU(JU)VCज़ ҏ౻ߒҰ !LPJD FTN 3BJMT%FWFMPQFST.FFUVQEBZ
άϥϯτ΢Ωϣ΢α΢ελϫʔ֊

ࠓ೔ͷ࿩

IUUQTUXJUUFSDPNLPJDTUBUVT

SBJMTSBJMT 3FNPWFA"4.VMUJCZUFATVOJDPEFUBCMF

$POUFYU Կނඞཁ͔

$POUFYU Կނඞཁ͔ .FSJU ͲΜͳಘ͕

)PX ࣮૷ϙΠϯτ

)PX ࣮૷ϙΠϯτ ࣮ࡍ͸· ͩଓ͘

.FTVSF ܭଌ

.FTVSF ܭଌ Ϛʔδͯ͠΋Β͏ͨΊʹඞཁͳ৘ใΛ ඞཁͳ͚ͩ٧Ί͍ͯΔ

౰ͨΓલΛ౰ͨΓલʹ Step up your natural commit skill

w5IFTFWFOSVMFTBHBJO w.Z3PDL)FSPFTJO +BQBO w(JU(JU)VCXPSLqPX "HFOEB

IUUQTDISJTCFBNTJPQPTUTHJUDPNNJU

4FQBSBUFTVCKFDUGSPNCPEZXJUIBCMBOLMJOF -JNJUUIFTVCKFDUMJOFUPDIBSBDUFST $BQJUBMJ[FUIFTVCKFDUMJOF %POPUFOEUIFTVCKFDUMJOFXJUIBQFSJPE 6TFUIFJNQFSBUJWFNPPEJOUIFTVCKFDUMJOF
8SBQUIFCPEZBUDIBSBDUFST 6TFUIFCPEZUPFYQMBJOXIBUBOEXIZWTIPX 5IFTFWFOSVMFTPGBHSFBU(JU DPNNJUNFTTBHF

IUUQTQPTUEDDIPXUPXSJUFBHJUDPNNJUNFTTBHF

৺ʹཹΊ͓͍͍ͯͯͩ͘͞ ͜Ε͸ࠓ·Ͱ΋ ݴΘΕ͖ͯͨ ͣͬͱ ͜ͱͰ͢ɻ

कഁ཭

.JYJO+BQBOFTF

w ߦۭ͚ͯॻ͖·͠ΐ͏ w HJUͷίϛοτϝοηʔδ͸ߦ໨͕ λΠτϧɺߦ໨Ҏ͕߱ຊจ w ߦ໨ΛۭʹͤͣຊจΛॻ͘ͱશͯλ Πτϧѻ͍ʹͳΓɺgit --oneline ΍tig
ίϚϯυͰҰॹͨ͘ʹͳΔ λΠτϧͷޙ͸ߦۭ͚ͯຊจΛॻ͘

λΠτϧͷޙ͸ߦۭ͚ͯຊจΛॻ͘ λΠτϧ ߦ໨ ຊจ ߦ໨Ҏ߱ ۭߦ ߦ໨

w ࣈ͸໨҆Ͱଟগӽ͑ͯ΋ྑ͍ w ཁ໿ʹͰ͖ͳ͍΄Ͳ௕͘ͳΔΑ͏Ͱ͋ Ε͹ͦΕ͸ຊจʹॻ͘͜ͱ w ίϛοτϝοηʔδ͸ʮԿނʯΛॻ͘ ΋ͷ͕ͩλΠτϧ͸ʮԿΛʯͰྑ͍ λΠτϧΛࣈҎ಺ʹ͓͞ΊΔ

w จষͷ࢝Ί͕େจࣈ͸ӳจ๏ͷجຊ w lӳจ๏จষઌ಄େจࣈz<ݕࡧ> w ೔ຊޠͳΒؾʹ͠ͳ͍ ؔ܎ͳ͍ λΠτϧͷจ಄Λେจࣈʹ͢Δ

w λΠτϧྖҬΛݮΒͤΔ w ೔ຊޠͰ΋۟఺͸ෆཁ w ۟఺͕ݱΕΔͱಡ఺΋ݱΕ࢝ΊͨΓཁ ໿͔Β௕Ίͷઆ໌΁ͱ཭Ε͍ͯ͘ w ΧϯϚɺಡ఺໨ඪͰ࠷େճΛ໨҆ ʹ͍ͯ͠Δ
λΠτϧͷจ຤ʹϐϦΦυΛ෇͚ͳ͍

w /" w ೔ຊޠͷ৔߹͸ମݴࢭΊ͔༻ݴࢭΊ͔ ΛͳΔ΂͘౷Ұ͍ͯ͠Δ w ݸਓతʹ͸༻ݴࢭΊΛ࢖͍ͬͯΔ w ந৅ྫʓʓΛ˚˚͢Δ λΠτϧ͸໋ྩ๏Ͱهड़͢Δ

w ࣈ͸໨҆Ͱଟগӽ͑ͯ΋ྑ͍ w 13ͷຊจʹॻ͘಺༰Λه͓ͯ͘͠ͱ ྑ͍ ޙड़͢Δ(JU)VCͱͷ࿈ಈྫ ຊจ͸ߦ͋ͨΓࣈҎ಺ʹ͓͞ΊΔ

w ʮͲͷΑ͏ʹ )PX ʯ͸࣮૷ΛಡΊ ͹Θ͔Δ w ʮԿΛ 8IBU ʯ͸ίϛοτϝοηʔ δߦ໨ʹλΠτϧͱͯ͠ه͢
w ʮͳͥ 8IZ ʯ͸ίϛοτϝοηʔ δߦ໨ͷຊจͱͯ͠ه͢ ຊจͰ͸ʮͲͷΑ͏ʹʯͰ͸ͳ͘ʮԿ ΛʯͱʮͳͥʯΛઆ໌͢Δ

8IBU ԿΛ͢Δ͔

$POUFYU Կނඞཁ͔ 8IBU ԿΛ͢Δ͔

$POUFYU Կނඞཁ͔ .FSJU ͲΜͳಘ͕ 8IBU ԿΛ͢Δ͔

$POUFYU Կނඞཁ͔ .FSJU ͲΜͳಘ͕ 8IBU ԿΛ͢Δ͔ 8IBU

$POUFYU Կނඞཁ͔ .FSJU ͲΜͳಘ͕ 8IBU ԿΛ͢Δ͔ 8IZ 8IBU

5IFTFBSF (VJEFMJOFT IUUQKBXJLJQFEJBPSHXJLJ&""&""&##&&##"NFEJB'JMF$BOUJOP1MBOJTQIFSFQOH

w5IFTFWFOSVMFTBHBJO w.Z3PDL)FSPFTJO +BQBO w(JU(JU)VCXPSLqPX "HFOEB

)FSPFT !LBNJQP !ZZBHJ !BNBUTVEB BOENPSF !ZBIPOEB !QPDLF

w ڧͦ͏ͳਓͨͪɻڧͦ͏ͳਓͨͪΛਅ ࣅΕ͹ڧ͘ͳΕͦ͏ w ڧ͍ਓୡ͸ίϛοτϝοηʔδ΋ڧ͍ w ίʔυ͚ͩͰͳ͘ίϛοτϝοηʔδ ΋ެ։͞Εͯͯഎத͔Β,BUBΛֶͿ ͜ͱ͕Ͱ͖Δ )FSPJTTUSPOH

,BUB 28"/ JO 2VBMJUZ8JUIPVU"/BNF

w l/PEFTDSJQUJPOQSPWJEFE͸ ಛʹॳର໘ʹରͯ͠ ࣦྱz w lͳͥͦͷ13ΛϚʔδ͢Δඞཁ͕͋ Δͷ͔Λॻ͘z w l༗ӹͳ৘ใ͸͢΂ͯه͢z w
l$PTNFUJDDIBOHFͰ͸͋͑ͯ͋ ·Γॻ͔ͳ͍ ࣭ྔͷରൺ z )FSPFT໊ݴू ࢲͷίϯύε

lOPEFTDSJQUJPO QSPWJEFEzΛ߇͑Δ (JU(JU)VC5JQT

#FGPSF IUUQTHJUIVCDPNNVSZPJNQMCVPZTQVMM

"GUFS IUUQTHJUIVCDPNCCBUTPWSVCPDPQQVMM

w5IFTFWFOSVMFTBHBJO w.Z3PDL)FSPFTJO +BQBO w(JU(JU)VCUJQT "HFOEB

My workflow before and after

w NBTUFSʹ͍Δ··࡞ۀ w ࡞ۀ໨ॲ͕͍ͭͨΒϒϥϯνΛ੾Δ w HJUDPNNJU࣌ʹ͸λΠτϧ͚ͩΛ ॻ͍ͯίϛοτ w 13ͰຊจΛॻ͘ ʙ೥͘Β͍લͷ࡞ۀϑϩʔ

w ࡞ۀͷཁ໿Λϒϥϯν໊ʹͯ͠ϒϥϯ νΞ΢τ w λΠτϧͱຊจΛίϛοτ w 13͸੔ܗͷΈ ݱࡏͷ࡞ۀϑϩʔ

w ࡞ۀͷཁ໿Λϒϥϯν໊ʹͯ͠ϒϥϯ νΞ΢τ w λΠτϧͱຊจΛίϛοτ w 13͸੔ܗͷΈ ݱࡏͷ࡞ۀϑϩʔ 5JQT঺հ

lOPEFTDSJQUJPOQSPWJEFEzΛ߇͑Δ ࡞ۀ໨తʹ͍ͭͯϒϥϯν໊Λ෇͚Δ ϒϥϯνΛߜΓࠐΊΔΑ͏ʹ͢Δ .BSLEPXOΛ࢖ͬͯίϛοτϝοηʔδΛॻ͘ λΠτϧͱҰॹʹຊจΛॻ͘
$MPTJOHLFZXPSETΛ׆༻͢Δ ؔ࿈͢Δίϛοτ͸TRVBTI͢Δ (JU(JU)VCUJQT ࡁ

࡞ۀ໨తʹ͍ͭͯ ϒϥϯν໊Λ෇͚Δ (JU(JU)VC5JQT

w ࡞ۀ ్த ͷ͜ͱʹ͍֮ͭͯॻʹͳΔ w (JU)VCͰͷλΠτϧΛΠϝʔδ͢Δ w Ϛʔδ͞ΕΔࡍʹl.FSHFQVMM SFRVFTUGSPNVTFS CSBODIOBNFzͱ͍ͬͨײ͡Ͱλ
ΠτϧʹೖΔͷͰͳΔ΂͘୹ͯ͘͠Δ ࡞ۀ໨తʹ͍ͭͯϒϥϯν໊Λ͚ͭΔ

λΠτϧͱϒϥϯν໊ͷ૬ҧ FH ϒϥϯν໊

ϒϥϯνΛߜΓࠐΊΔΑ͏ ʹ͢Δ (JU(JU)VC5JQT

ϒϥϯν໊ͰߜΓࠐΉ alias cb=‘ git checkout ` git branch | peco
| sed -e "s/\* //g" | awk "{print \$1}"`' IUUQTHJUIVCDPNLPJDEPUpMFTCMPCFECECGBCGCEPUTIHJUTI- ߜΓࠐΈ༻ ΤΠϦΞε

ϒϥϯν໊ͰߜΓࠐΉ IUUQTHJUIVCDPNLPJDEPUpMFTCMPCFECECGBCGCEPUTIHJUTI- QFDPͰߜΓࠐΈ

w LPJDΦϦδφϧ w ࡞Γ͔͚ͷϩʔΧϧͷ΋ͷɺੜࣽ͑Ͱ ެ։ʹ͸ૣ͗͢Δ w ෳ਺ͷ࡞ۀதϒϥϯνΛ࣋ͭϦϙδτ ϦͰͷϒϥϯνߜΓࠐΈͷϔϧύʔ w ෆඞཁʹόοΫϦϯΫΛ͚ͭͨ͘ͳ͍
࡞ۀதϒϥϯνͷ઀಄ࢠʹXJQ@Λ෇͚Δ

XJQ@Ͱ࢝·Δϒϥϯν͸QVTIͰ͖ͳ͍ #!/bin/sh # if [ "$(git rev-parse --abbrev-ref HEAD |
grep '^wip_')" ]; then echo "\033[0;31m[ABORT] You cannot push a branch whose prefix is \`wip_\`. \033[0;39m" 1>&2 exit 1 fi exit 0 IUUQTHJUIVCDPNLPJDEPUpMFTDPNNJUGCBCEEDEFGCCEFEGB HJUIPPLT QSFQVTI

.BSLEPXOΛ࢖ͬͯ ίϛοτϝοηʔδΛॻ͘ (JU(JU)VC5JQT

IUUQLPJDIBUFOBCMPHDPNFOUSZHJUDPOpHHMPCBMDPSFDPNNFOUDIBS

w HJUͷσϑΥϧτͩͱɺίϛοτϝοηʔ δΛฤू͢ΔΤσΟλͰͷίϝϯτߦ͕ ʹͳ͍ͬͯΔ w ҰํͰ(JU)VCͷ1VMM3FRVFTUͰ จॻߏ଄Λ࡞Δ࣌͸.BSLEPXOͱͳ ΔͨΊɺݟग़͠ʹ࢖͏͕ίϝϯτߦͱ ͯ͠ίϛοτϝοηʔδ͔Βফ͍͑ͯͨ ΁Μෆศ
.BSLEPXOͰॻ͘5JQ

ίϝϯτͷจࣈΛ͔Βมߋ͢Δ % git config --global core.commentchar '^' ?ʹมߋ͢Δ w ΋ͪΖΜ?Ͱͳͯ͘΋ྑ͘ɺϓϥοτϑΥʔ
ϜͰൺֱతߦ಄ʹ࢖Θͳͦ͞͏ͳ΋ͷΛબͿ w ྫ͑͹3VCZͩͱ΍!ͳͲ͸ίϛοτϝο ηʔδͰίʔυྫΛه͠͏ΔͷͰ࢖͑ͳ͍

ίϝϯτͷจࣈΛ͔Βมߋ͢Δ diff --git a/dot.gitconfig b/dot.gitconfig index 07e3ef8..a95eae6 100644 --- a/dot.gitconfig
+++ b/dot.gitconfig @@ -30,6 +30,7 @@ branch = auto interactive = auto [core] + commentchar = ^ editor = emacsclient -nw -a '' excludesfile = ~/.gitignore [diff] % git config --global core.commentchar '^' HJUDPOpH΁ͷ௥Ճ

λΠτϧͱҰॹʹຊจΛॻ͘ (JU(JU)VC5JQT

w 1VMM3FRVFTUʹॻ͘͜ͱΛ͋Β͔͡Ίί ϛοτϝοηʔδʹه͢ w ʮίϛοτˠ13࣌ʹॻ͘ʯͰ͸ͳ͘ʮίϛο τ࣌ʹॻ͘ˠ13͸੔ܗ͘Β͍ʯ w Ͳ͏ͤॻ͘ͳΒϒϥ΢βͰ͸ͳ͘޷͖ͳΤ σΟλͰ w
NBTUFSQVTI͢Δͱ͖ͱྲྀΕΛม͑ͳ͍ λΠτϧͱҰॹʹຊจΛॻ͘

HJUDPNNJU࣌ʹΤσΟλฤू͢Δ

13࣌ʹλΠτϧຊจ͕ຒ·ͬͯΔ

$MPTJOHLFZXPSET Λ׆༻͢Δ (JU(JU)VC5JQT

w ίϛοτϝοηʔδʹ'JYFT൪߸ ͳͲؚΉͱ*TTVF΁ͷΫϩʔζ࿈ܞ ʹͳΔ w طʹڍ͕͍ͬͯΔ*TTVF΁ͷϙΠϯ λʹ΋ͳΔར఺͕͋Δ $MPTJOH,FZXPSETΛ׆༻͢Δ

IUUQTIFMQHJUIVCDPNBSUJDMFTDMPTJOHJTTVFTVTJOHLFZXPSET ༗ޮͳΩʔϫʔυ

'JYFTͷྫ FH *TTVFΛ ࢦఆ͍ͯ͠Δ

'JYFTͷྫ FH *TTVFΛ·ͱΊͯ ࢦఆ͍ͯ͠Δ

'JYFTͷྫ FH ϦϙδτϦʹΑΓ λΠτϧهࡌ

ؔ࿈͢Δίϛοτ͸ TRVBTI͢Δ (JU(JU)VC5JQT

ຬΛ࣋ͯ͠13΁ͷ४උ 1SPCMFN දग़͢Δ໰୊

ຬΛ࣋ͯ͠13΁ͷ४උ $POUFYU ඞཁͳഎܠ

ຬΛ࣋ͯ͠13΁ͷ४උ 8IZ ରҊͱͷൺֱ $POUFYU ඞཁͳഎܠ

0QFOB13

ࢲͷ3VCP$PQྗ͸ Use ""

TRVBTI HJUQVTIIFBEG

w ϝϯςφ͸ɺϩʔΧϧͰͷ։ൃ ྫ5%% ʹΑΔSFEDPNNJUHSFFO DPNNJUSFGBDUPSDPNNJUͷ ίϛοτཻ౓ʹ͸ڵຯ͕ͳ͍ w 13લͷϩʔΧϧ͸࡞ۀΛҰ۠੾Γͨ͠ ཻ͍౓ɺ13ϚʔδޙͷϦϞʔτ͸มߋ ཤྺΛ௥ཻ͍͍ͨ౓ͱͳΔ
TRVBTI΁ͷࢥߟ

w ϝϯςφϯεͰݫີʹॏཁͳͷ͸ҎԼ w ίϛοτͰͭͷมߋཧ༝Ͱ͋Δ͜ͱ w ςετίʔυ͕ηοτͰ͋Δ͜ͱ w ݁࿦13ϨϏϡʔޙʹTRVBTI͢Δ Α͏ٻΊΒΕΔ͕ɺ͜Ε͸ਖ਼͍࢟͠੎ Ͱ͋Δ
TRVBTI΁ͷࢥߟ

͓Ϛʔδ

ϝϯςͷྺ࢙ʹ։ൃ్্ͷ͸ෆཁ ίϛοτʹTRVBTIͯ͠ ෆཁͳίϛοτ͕ݱΕͳ͍

ॱಓ੍উ ͍·͋ΔྗͰಊʑͱίϛϡχςΟʹࢀՃ

w SBJMTSBJMTϦϙδτϦ͔Β͸ɺ3BJMTͷίʔ υ͚ͩͰͳ͘13ͷग़͠ํ͔Βίϛοτϝο ηʔδͷॻ͖ํ΋ֶͿ͜ͱ͕Ͱ͖Δ w ಛʹίϯτϦϏϡʔλ࣌୅͔Βίϛολʔ ʹͳ͍ͬͯΔ3BJMTίϛολʔͷίϛοτ ͸͓खຊʹ͓͢͢Ί ૞ࠪҰ՝՝௕ײ͋Δ
w ίϛοτϝοηʔδΛ੍͢Δ΋ͷ͸Ϧϙδ τϦͷྺ࢙ͷ҆ఆΛ੍͢Δ ͓ΘΓʹ

IUUQTUXJUUFSDPNLPJDTUBUVT

3BJMT044ύονձ ݄࣍։࠵

࣍ճ݄೔ ݄ ʙFTNʹͯ :PV

One more thing…

͋ͱ͸෼͔Γ·͢Ͷʁ ࠾༻ ೥Ҏ্ͷ3BJMTΞϓϦ։ൃͷ࣮੷ l3BJMT044Λ௨͡੒௕͍ͨ͠ϓϩάϥϚʔz @koic·ͰͲ͏ͧ

Commit message will never die

Commit message will never die

More Decks by Koichi ITO

Other Decks in Technology

Featured

Transcript