DevOps/Git

[Git] Commit ๋ฉ”์‹œ์ง€ ์ˆ˜์ •ํ•˜๊ธฐ

2024. 12. 8. 10:00ยทDevOps/Git

 

๐Ÿ”‘ 1. ์•„์ง Commit์ด Local์— ์žˆ๋Š” ๊ฒฝ์šฐ

Remote์— push๋Š” ํ•˜์ง€ ์•Š๊ณ , Local์— commit๋งŒ ํ•ด๋†“์€ ๊ฒฝ์šฐ!

 

โœจ๊ฐ€์žฅ ์ตœ๊ทผ์˜ commit ์ˆ˜์ •ํ•˜๊ธฐ

  1. ํ•ด๋‹น ํ”„๋กœ์ ํŠธ์˜ ๋ธŒ๋žœ์น˜์—์„œ ๋กœ๊ทธ์ธ ๋œ ์ƒํ™ฉ์—์„œ git commit --amend ๋ฅผ ์ž…๋ ฅํ•˜๊ธฐ!
  2. ๊ฐ€์žฅ ์ตœ๊ทผ์˜ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๊ฐ€ ๋œจ๊ฒŒ ๋จ!
  3. ๋…ธ๋ž€ ๋ถ€๋ถ„์„ ์ˆ˜์ •ํ•œ ํ›„, esc๋ˆ„๋ฅด๊ณ  :wq (์ €์žฅ+์ฐฝ๋‹ซ๊ธฐ) ํ•ด์ค€ ํ›„ ์ข…๋ฃŒ!

โœจ ์˜ค๋ž˜๋œ commit ์ˆ˜์ •, ํ•œ๋ฒˆ์— ์—ฌ๋Ÿฌ commit ์ˆ˜์ •ํ•˜๋Š” ๋ฐฉ๋ฒ•

  1. ์ปค๋งจ๋“œ ๋ผ์ธ์— git log๋ฅผ ์ž…๋ ฅํ•˜๊ธฐ!
  2. ์œ„์—์„œ๋ถ€ํ„ฐ ๋ช‡ ๋ฒˆ์งธ ์ปค๋ฐ‹์„ ์ˆ˜์ •ํ•  ๊ฒƒ์ธ์ง€ ํ™•์ธํ•˜๊ณ , git rebase -i HEAD~์ˆซ์ž ์ž…๋ ฅํ•˜๊ธฐ!
  3. ์ˆ˜์ •ํ•˜๊ณ  ์‹ถ์€ ์ปค๋ฐ‹ ์˜†์— pick์„ ์ง€์šฐ๊ณ , reword๋กœ ๋ณ€๊ฒฝํ•˜๊ธฐ
  4. esc -> :wq ํ•˜๊ณ  ๋‚˜๋ฉด, reword๋กœ ๋ฐ”๊พผ ์ปค๋ฐ‹์„ ์ˆ˜์ •ํ•  ์ˆ˜ ์žˆ๋Š” ์ฐฝ์ด ๊ฐ๊ฐ ๋œจ๊ฒŒ ๋จ!
  5. ์›ํ•˜๋Š” ๋Œ€๋กœ ์ปค๋ฐ‹ ์ˆ˜์ • ํ›„ :wq ์ €์žฅํ•˜๋ฉด ๋!



๐Ÿ”‘ 2. ์ด๋ฏธ remote์— push ๋œ ๊ฒฝ์šฐ

force push ๋ฐ–์— ๋‹ต์ด ์—†์œผ๋‚˜, github์—์„œ๋Š” ๊ณต์‹์ ์œผ๋กœ force๋ฅผ ์ง€์–‘ํ•˜๋„๋ก ๊ถŒ์žฅํ•จ.
(push ๋œ ์ปค๋ฐ‹์˜ ๋กœ๊ทธ๋ฅผ ๊ฐ–๊ณ  ์žˆ๋˜ ๋‹ค๋ฅธ ํŒ€์›๋“ค์ด ๋กœ๊ทธ๋ฅผ ์ˆ˜๋™์œผ๋กœ ์ˆ˜์ •ํ•ด์•ผ ํ•˜๊ธฐ ๋•Œ๋ฌธ)

local์—์„œ commit ๋ฉ”์‹œ์ง€ ์ˆ˜์ • ํ›„, git push --force ๋ธŒ๋žœ์น˜์ด๋ฆ„ ํ•ด์ฃผ๋ฉด ๋จ!

์ €์ž‘์žํ‘œ์‹œ (์ƒˆ์ฐฝ์—ด๋ฆผ)

'DevOps > Git' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€

[Git] ์ด๋ฏธ Pushํ•œ Commit ์‚ญ์ œํ•˜๊ธฐ  (0) 2024.12.11
[Git] IntelliJ์—์„œ ์ƒ์„ฑํ•œ ํ”„๋กœ์ ํŠธ Github์— ์—ฐ๊ฒฐํ•˜๊ธฐ  (0) 2024.12.10
[Git] fatal: bad revision ์˜ค๋ฅ˜ ์›์ธ ๋ฐ ํ•ด๊ฒฐ๋ฒ• (feat. cherry-pick)  (1) 2024.07.31
[Git] remote: Support for password authentication was removed. Please use a personal access token instead. ์—๋Ÿฌ ํ•ด๊ฒฐ  (0) 2024.07.05
[Git] Remote ์›๊ฒฉ ์ €์žฅ์†Œ ํ™•์ธ ๋ฐ ์—ฐ๊ฒฐ ๋Š๊ธฐ  (0) 2024.07.04
'DevOps/Git' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€
  • [Git] ์ด๋ฏธ Pushํ•œ Commit ์‚ญ์ œํ•˜๊ธฐ
  • [Git] IntelliJ์—์„œ ์ƒ์„ฑํ•œ ํ”„๋กœ์ ํŠธ Github์— ์—ฐ๊ฒฐํ•˜๊ธฐ
  • [Git] fatal: bad revision ์˜ค๋ฅ˜ ์›์ธ ๋ฐ ํ•ด๊ฒฐ๋ฒ• (feat. cherry-pick)
  • [Git] remote: Support for password authentication was removed. Please use a personal access token instead. ์—๋Ÿฌ ํ•ด๊ฒฐ
sol_git
sol_git
Full-Stack์„ ๊ฟˆ๊พธ๋Š” Junior Developer๐Ÿ’–
  • sol_git
    ์†”๊นƒํ•œ Dev
    sol_git
  • ๊ธ€์“ฐ๊ธฐ ๊ด€๋ฆฌ์ž
  • ์ „์ฒด
    ์˜ค๋Š˜
    ์–ด์ œ
    • ๋ถ„๋ฅ˜ ์ „์ฒด๋ณด๊ธฐ (40)
      • Frontend (13)
        • Javascript (1)
        • React (9)
        • Vue (1)
        • Svelte (1)
      • Style Sheet (0)
        • Sass (0)
      • Backend (4)
        • Java (3)
        • Python (1)
        • Spring Boot (0)
      • AI (0)
        • LLM (0)
        • Gen AI (0)
      • DevOps (16)
        • Git (16)
        • Kubernetes (0)
      • Cloud (0)
        • AWS (0)
      • DBMS (2)
        • MySQL (1)
        • PostgreSQL (1)
      • IDE & Tools (3)
        • IntelliJ (1)
        • VS Code (1)
        • Tool (1)
      • OS (2)
        • Mac (2)
      • Project ์ผ๊ธฐ (0)
  • ๋ธ”๋กœ๊ทธ ๋ฉ”๋‰ด

    • ๋ฐฉ๋ช…๋ก
  • ๋งํฌ

    • Github
  • ์ธ๊ธฐ ๊ธ€

  • ์ตœ๊ทผ ๋Œ“๊ธ€

  • hELLOยท Designed By์ •์ƒ์šฐ.v4.10.3
sol_git
[Git] Commit ๋ฉ”์‹œ์ง€ ์ˆ˜์ •ํ•˜๊ธฐ
์ƒ๋‹จ์œผ๋กœ

ํ‹ฐ์Šคํ† ๋ฆฌํˆด๋ฐ”