Git鎿嶄綔鎸囦护鍚堥泦

钃濊壊娓�婀�

Git鎿嶄綔鎸囦护鍚堥泦

鑷�宸辨湰韬�浠ｇ爜闆堕浂纰庣�庡湪Git涓�瀛樻斁锛屼絾浣跨敤棰戠巼涓嶉珮锛屾墍浠ョ粡甯搁亣鍒版湰鍦颁粨搴撳拰杩滅��浠撳簱瀵逛笉涓婏紝瀵艰嚧鏂板�炴枃浠跺け璐ョ瓑闂�棰橈紝鎵�浠ユ�荤粨浜嗕笅Git甯哥敤鐨勪竴浜涘懡浠わ紝浠呬緵鍙傝�� ~~~
Git绠�浠嬩笌鍩烘湰姒傚康

Git鏄�涓�涓�鍒嗗竷寮忕増鏈�鎺у埗绯荤粺锛岀敱Linus Torvalds浜�2005骞翠负Linux鍐呮牳寮�鍙戣�屽垱寤恒�傚畠涓昏�佺敤浜庤窡韪�鏂囦欢鍙樻洿锛屽崗璋冨�氫汉鍗忎綔寮�鍙戦」鐩�锛屽苟淇濈暀椤圭洰鍘嗗彶璁板綍銆備笌闆嗕腑寮忕増鏈�鎺у埗绯荤粺(濡係VN)涓嶅悓锛孏it鐨勬瘡涓�鐢ㄦ埛閮芥嫢鏈夊畬鏁寸殑浠ｇ爜浠撳簱鍓�鏈�銆�
涓�銆佹湰鍦板凡鏈変粨搴撴搷浣�

1锔忊儯 鏌ョ湅鐘舵��

1. # 鏌ョ湅鎻愪氦鍘嗗彶git status
2. # 鏌ョ湅鎻愪氦鍘嗗彶git log --oneline --graph --decorate --all

澶嶅埗浠ｇ爜

2锔忊儯鏂板�炴枃浠舵垨鏂囦欢澶�

1. # 灏嗗崟涓�鏂囦欢鍔犲叆鏆傚瓨鍖篻itadd 鏂囦欢璺�寰�
3. # 灏嗘暣涓�鏂囦欢澶瑰姞鍏ユ殏瀛樺尯锛堝寘鍚�瀛愮洰褰曪級gitadd 鏂囦欢澶硅矾寰�
5. # 鎴栬�呯洿鎺ヤ竴娆℃�ф坊鍔犳墍鏈夋柊鏂囦欢鍜屼慨鏀筭itadd.

澶嶅埗浠ｇ爜

鈿狅笍 Git 涓嶄細璺熻釜绌烘枃浠跺す锛屽彲浠ュ湪绌烘枃浠跺す閲屽姞涓�涓� .gitkeep 鏂囦欢銆�
3锔忊儯 鎻愪氦淇�鏀瑰埌鏈�鍦�

1. git commit -m "鎻忚堪鏈�娆℃彁浜ょ殑鍐呭��"
2. 渚嬪�傦細
3. git commit -m "Add new project folder and PDF document"

澶嶅埗浠ｇ爜

4锔忊儯 鏌ョ湅鏈�鍦版彁浜ゅ拰杩滅��鐘舵��

1. # 鏌ョ湅鏈�鍦板垎鏀�涓庤繙绔�鍒嗘敮宸�寮俫it status
3. # 鏌ョ湅鍒嗘敮涓庤繙绔�鎻愪氦宸�寮俫it fetch
4. git log origin/main..main --oneline

澶嶅埗浠ｇ爜

5锔忊儯 鎷夊彇杩滅��鏈�鏂版彁浜わ紙瀹夊叏鍚屾�ワ級

1. # 鎷夊彇杩滅��鏈�鏂版彁浜ゅ苟 rebase锛堟帹鑽愶級git pull origin main --rebase
3. # 濡傛灉涓嶆兂 rebase锛屼娇鐢� mergegit pull origin main

澶嶅埗浠ｇ爜

濡傛灉鏈�鍦版湁鏈�鎻愪氦鏀瑰姩锛岄渶瑕佸厛 git add/commit 鎴� git stash
6锔忊儯 鎺ㄩ�佹湰鍦版彁浜ゅ埌杩滅��

1. # 鏅�閫氭帹閫乬it push origin main
3. # 濡傛灉鎺ㄩ�佽��鎷掔粷锛堣繙绔�鏈夋洿鏂帮級锛屽厛 pull 鎴栧己鍒舵帹閫乬it push -f origin main  # 鈿狅笍 灏忓績瑕嗙洊杩滅��

澶嶅埗浠ｇ爜

7锔忊儯 澶勭悊鍐茬獊锛坮ebase / merge锛�

1. # 鏌ョ湅鍐茬獊鏂囦欢git status
3. # 缂栬緫鍐茬獊鏂囦欢鎵嬪姩瑙ｅ喅# 鏍囪�板凡瑙ｅ喅gitadd 鍐茬獊鏂囦欢
5. # 缁х画 rebasegit rebase --continue
7. # 濡傛灉鏀惧純 rebasegit rebase --abort

澶嶅埗浠ｇ爜

鍐茬獊绫诲瀷甯歌�侊細
both modified 鈫� 涓よ竟閮戒慨鏀逛簡鍚屼竴琛�
both added 鈫� 涓よ竟閮芥柊澧炰簡鍚屽悕鏂囦欢
8锔忊儯 鏆傚瓨鏈�鎻愪氦淇�鏀癸紙stash锛�

1. # 鏆傚瓨鏈�鍦版敼鍔╣it stash
3. # 鏌ョ湅 stash 鍒楄〃git stash list
5. # 鎭㈠�嶆渶鏂� stashgit stash pop
7. # 搴旂敤 stash 浣嗕笉鍒犻櫎git stash apply

澶嶅埗浠ｇ爜

浜屻�佹柊寤烘湰鍦颁粨搴�

1锔忊儯 鍦� GitHub 鍒涘缓浠撳簱

1銆佺櫥褰� GitHub 鈫� New Repository 鈫� 濉�鍐欎粨搴撳悕
2銆佸彲浠ラ�夋嫨鍒濆�嬪寲 README 鎴栫┖浠撳簱
2锔忊儯 鏈�鍦版柊寤轰粨搴撳苟鍏宠仈杩滅��

1. # 杩涘叆椤圭洰鐩�褰昪d /path/to/project
3. # 鍒濆�嬪寲 Git 浠撳簱git init
5. # 娣诲姞杩滅��浠撳簱git remote add origin git@github.com:鐢ㄦ埛鍚�/浠撳簱鍚�.git
7. # 鎴� HTTPSgit remote add origin https://github.com/鐢ㄦ埛鍚�/浠撳簱鍚�.git
9. 渚嬪�傦細
10. 1銆佹坊鍔犺繙绔�浠撳簱
11. git remote add origin git@github.com:hold***code/***Code.git
12. 2銆佹媺鍙栬繙绋嬶紙鍚� README锛�
13. git pull origin main --allow-unrelated-histories

澶嶅埗浠ｇ爜

3锔忊儯 涓婁紶棣栨�℃彁浜�

1. # 娣诲姞鎵�鏈夋枃浠秅itadd.# 鎻愪氦git commit -m "Initial commit"# 鎺ㄩ�佸埌杩滅�� main 鍒嗘敮git push -u origin main

澶嶅埗浠ｇ爜

-u 浼氭妸鏈�鍦板垎鏀�涓庤繙绔�鍒嗘敮鍏宠仈锛屼箣鍚庣洿鎺� git push 鍗冲彲
涓夈�佽繙绔�浠撳簱绠＄悊

1. # 娣诲姞鎵�鏈夋枃浠�# 鏌ョ湅杩滅��浠撳簱鍦板潃git remote -v
3. # 淇�鏀硅繙绔�浠撳簱鍦板潃git remote set-url origin 鏂板湴鍧�
5. # 鍒犻櫎杩滅�痝it remote remove origin

澶嶅埗浠ｇ爜

鍥涖�佸父鐢ㄨ緟鍔╂寚浠�

1. # 鏌ョ湅鎻愪氦宸�寮俫itdiff# 鏌ョ湅鏆傚瓨鍖哄樊寮俫itdiff --staged
3. # 鏌ョ湅鏌愪釜鏂囦欢鎻愪氦鍘嗗彶git log -- 鏂囦欢璺�寰�
5. # 鍥為��鍒颁笂涓�涓�鎻愪氦锛堜繚鐣欎慨鏀瑰湪宸ヤ綔鍖猴級git reset --soft HEAD~1
7. # 鍥為��鍒颁笂涓�涓�鎻愪氦锛堜涪寮冧慨鏀癸級git reset --hard HEAD~1

澶嶅埗浠ｇ爜

娉ㄦ剰涓�鏂囪矾寰勭瓑锛孏IT鍙�浠ヨ瘑鍒�锛屼絾鏄�灏介噺涓嶈�佷娇鐢ㄤ腑鏂囪矾寰勶紝涓婁紶澶辫触杩囧ソ鍑犳��, (涓婅堪鍛戒护鍧囦负瀹炶返杩囩▼涓�寰楀嚭锛屽�傛灉浣跨敤杩囩▼鏈夋姤閿欏缓璁�閰嶅悎chatgpt / gemini椋熺敤鏇翠匠鍝堝搱鍝�)
鏂板�炵瑪璁帮細
鐜版湁椤圭洰涓�锛屾垜鍦ㄦ湰鍦颁粨搴撳垹闄や簡鏌愪簺鏃犵敤鏂囦欢锛屾兂瑕佸悓姝ヨ繙绔�浠撳簱搴旇�ユ�庝箞鎿嶄綔锛熷�備笅鎵�绀猴細

1. # 鏌ョ湅鐘舵�乬it status
3. On branch main
4. Your branch is up to date with 'origin/main'.
6. Changes not staged for commit:
7.   (use "git add/rm <file>..." to update what will be committed)(use "git restore <file>..." to discard changes in working directory)
8.         deleted:    **project/***/.vscode/settings.json
9.         deleted:    **project/***/Drivers/BSP/ADC/adc.c
10.         deleted:    **project/***/Drivers/BSP/ADC/adc.h
11.         deleted:    **project/***/Drivers/BSP/ADC/temper.c
12.         deleted:    **project/***/Drivers/BSP/ADC/temper.h
13.         *****************************
14. # 鎵归噺鎻愪氦鍒犻櫎锛歡itadd -u
16. # 鎻愪氦淇�鏀瑰苟鍔犱笂鏃ュ織淇℃伅git commit -m "Remove Double files"git push origin main

澶嶅埗浠ｇ爜