gitcommoncommandgitblame[file]//鏄剧ず涓€涓枃浠剁殑鎻愪氦鍘嗗彶gitdiff//鏄剧ず鏆傚瓨鍖哄拰宸ヤ綔鍖虹殑鍖哄埆gitdiffbranch1branch2//姣旇緝涓や釜鍒嗘敮鐨勫尯鍒玤itcheckout.//鍒犻櫎鏆傚瓨鍖虹殑鎵€鏈夊彉鍖杇itshow[commit]//鏄剧ず鏌愭鎻愪氦鐨勫厓鏁版嵁鍜屽唴瀹瑰彉鍖杇itlog--oneline//涓€琛屾樉绀篻it鎻愪氦鍘嗗彶gitlog--graph//鏍戝舰灞曠ずgitlog--stat//鏄剧ず鎻愪氦鍘嗗彶锛屼互鍙婃瘡娆℃彁浜ょ殑鏂囦欢鍙樺寲gitk//绫讳技sourcetree鐨勭鐞嗗鎴风gitreflog//鍒濆鍖栨渶杩戠殑鎻愪氦锛屽垵濮嬪寲涓€涓湰鍦颁粨搴撳弬鑰冩甯告祦绋媑itclone[url](themaster鍒嗘敮宸插湪鏈湴鐢熸垚锛夊垱寤烘湰鍦癲ev鍒嗘敮鐨勪袱绉嶆柟娉昰itcheckout-bfeature/xxx//鍩轰簬鏈湴master鍒嗘敮鍒涘缓gitcheckout-bfeature/xxxorigin/master//鍩轰簬杩滅▼master锛屽垱寤哄苟淇敼鏈湴鍒嗘敮dev涓婄殑宸ヤ綔銆備慨鏀瑰悗锛実itadd銆?浠ｇ爜娣诲姞鍒版殏瀛樺尯锛屽鏋滄槸鏂版枃浠讹紝浣跨敤gitadd-A鎴栬€呮坊鍔犳枃浠跺悕)gitcommit-m'鎻愪氦璇勮'(浠ｇ爜鎻愪氦鍒版湰鍦扮増鏈簱)gitpullorigindeveloper锛堝皢杩滅▼developer鍒嗘敮涓婄殑鏈€鏂板唴瀹规媺鍒版湰鍦帮級gitpushorigindeveloper锛堝皢鏈湴developer鍒嗘敮涓婄殑鍐呭鎺ㄩ€佸埌杩滅▼锛夎嚦姝わ紝鏁翠釜宸ヤ綔娴佺▼缁撴潫锛佹湰鍦板垎鏀拰杩滅▼鍒嗘敮鍚屾椂瀛樺湪鐨勬儏鍐点€傛湰鍦板垎鏀瓨鍦ㄤ簬杩滅▼锛屾病鏈夊搴旂殑鍒嗘敮銆傚浣曞皢鏈湴鍒嗘敮鎺ㄩ€佸埌杩滅▼锛屽苟鍦ㄨ繙绋嬪垱寤哄悓鍚嶅垎鏀苟鑱旂郴锛焔itpushorigintest锛堝鏋滆繙绋嬩笉瀛樺湪娴嬭瘯鍒嗘敮锛屽垯鑷姩鍦ㄨ繙绋嬪垱寤轰竴涓祴璇曞苟涓庢湰鍦版祴璇曞垎鏀仈绯伙級鎴杇itpush--set-upstream涔嬪墠鍦╫rigintest涓婄殑鍛戒护鐨勫ソ澶勬槸涓嬫鍦ㄥ垎鏀笂push鐨勬椂鍊欏彲浠ョ洿鎺ヤ娇鐢╣itpush鍛戒护锛屽洜涓哄垎鏀凡缁忓拰杩滅▼鍒嗘敮寤虹珛浜嗚仈绯汇€傝繙绋嬪垎鏀凡缁忓瓨鍦ㄣ€傚鏋滄兂鍦ㄦ湰鍦板垱寤哄垎鏀紝骞跺缓绔嬭繙绋嬪垎鏀窡韪叧绯籫itcheckout-bdeveloperorigin/developer锛堝熀浜庤繙绋嬪紑鍙戣€呭垎鏀紝鍒涘缓鏈湴鍒嗘敮锛塷rgitcheckout--trackorigin/developer锛堟鏃讹紝a浼氬湪鏈湴鍒涘缓鍚嶄负developer鐨勬柊鍒嗘敮锛屾鏃朵細鑷姩璺熻釜杩滅▼鐨勫悓鍚嶅垎鏀痙eveloper锛夋垨鑰呯洿鎺ヤ娇鐢╣itcheckoutbranch_name锛堜娇鐢╰ab閿ˉ鍏ㄥ垎鏀悕锛夛紝鍦ㄨ繖涓垱寤虹殑鍒嗘敮鏂瑰紡浼氬拰杩滅▼鍒嗘敮寤虹珛鐩磋繛锛堣繖绉嶆柟寮忔渶绠€鍗曪級鍒犻櫎杩滅▼鍒嗘敮gitpushorigin:the_branch//鍒犻櫎杩滅▼the_branch鍗冲悜杩滅▼git鍒嗘敮鎺ㄩ€佷竴涓┖鐨勫唴瀹广€傚綋浣犲湪鍐欎竴涓柊鍔熻兘鐨勬椂鍊欙紝绐佺劧鎭朵骇鍝佺嫍鎻愬嚭浜嗕竴涓猙ug锛岃浣犲湪涓€涓皬鏃跺唴淇銆傝繖涓椂鍊欙紝浣犲彧鑳芥斁涓嬫墜涓殑宸ヤ綔銆傝淇姝ら敊璇紝浣嗘槸濡傛灉鎮ㄦ鏃朵笉鎯虫彁浜ゅ綋鍓嶄慨鏀圭殑浠ｇ爜鎬庝箞鍔烇紵锛燂紵git寮哄ぇ鐨勫垎鏀姛鑳藉氨娲句笂鐢ㄥ満浜嗐€傜涓€绉嶆柟娉曟搷浣滄楠わ細鏂板缓鍒嗘敮骞舵彁浜や慨鏀癸紝鍙渶瑕佷互涓嬪嚑姝ュ嵆鍙痝itcheckout-bbug001//鍒涘缓bug鍒嗘敮锛屼慨鏀瑰畬鎴愬悗鍒囨崲銆俫itadd,gitcommit-m''鍒囨崲鍒板紑鍙戝垎鏀痐gitcheckoutdev``gitmergebug001ondev```gitpushdevoriginDeveloper`鎻愪氦瀹屾垚鍚庡垏鎹㈠洖宸ヤ綔鍒嗘敮锛岀户缁師鏉ョ殑work绗簩绉嶆柟妗堟槸浣跨敤gitstash鍛戒护鍛戒护鍔熻兘锛氬浠藉綋鍓嶅伐浣滃尯鐨勫唴瀹癸紝浠庢渶杩戜竴娆℃彁浜や腑璇诲彇鐩稿叧鍐呭锛屼娇宸ヤ綔鍖轰笌涓婃鎻愪氦鐨勫唴瀹逛竴鑷达紝淇濆瓨褰撳墠宸ヤ綔鍖哄唴瀹瑰埌Git鍫嗘爤銆傚懡浠ら€夐」锛歡itstash灏辨槸涓婇潰鐨勫姛鑳絞itstashlist:鏄剧ずGit鍫嗘爤涓殑鎵€鏈夊浠斤紝浣犲彲浠ヤ娇鐢ㄨ繖涓垪琛ㄦ潵鍐冲畾浠庡摢閲屾仮澶嶃€俫itstashapplystash@{x}//x:鎭㈠鍝釜澶囦唤涓撻棬閽堝鍒楄〃涓垪鍑虹殑缂栧彿gitstashdropstash@{X}//浠庤褰曞垪琛ㄤ腑鍒犻櫎鐩稿簲鐨勪复鏃惰褰昰itstashpop:鏉ヨ嚜Git浠庢爤涓鍙栦笂娆′繚瀛樼殑鍐呭锛屾仮澶嶅伐浣滃尯涓殑鐩稿叧鍐呭銆傜敱浜嶴tash鐨勫唴瀹瑰彲鑳芥湁澶氫釜锛屾墍浠ヤ娇鐢ㄦ爤鏉ョ鐞嗭紝pop浼氫粠鏈€杩戠殑stash涓鍙栧苟鎭㈠鍐呭銆俫itstashclear锛氭竻闄it鍫嗘爤銆傝繖鏃跺€欎娇鐢╣it绛夊浘褰㈠寲宸ュ叿浼氬彂鐜板師鏉tash鐨勬墍鏈夎妭鐐归兘娑堝け浜嗐€俫itdeletebranch鍒犻櫎鏈湴鍒嗘敮gitbranch-Dbrdeleteremotebranchgitpushorigin:br(origin鍚庨潰鏈変竴涓┖鏍?鍗筹細push涓€涓┖鍒嗘敮鍒拌繙绋嬪垎鏀紝骞跺悎骞朵袱涓繙绋嬪垎鏀鏋滆繙绋嬫湁涓や釜鍒嗘敮瀹冧滑鍒嗗埆鏄痬aster鍜宒ev鍒嗘敮銆備袱涓垎鏀殑鍐呭鏄笉鍚岀殑銆傛湰鍦版湁master鍒嗘敮銆傚湪鏈湴鍒涘缓涓€涓猟ev鍒嗘敮锛屽苟涓庤繙绋媎ev鍒嗘敮寤虹珛杩炴帴銆傚湪dev鍒嗘敮涓婂悎骞秏aster鍒嗘敮锛屽皢dev鍒嗘敮鎺ㄩ€佸埌杩滅▼鎿嶄綔鍛戒护锛歡itcheckout-borigin/devestablishcontactgitmergemastermergemasterbranchgitpushorigindev鏈湴dev鍒嗘敮鎺ㄩ€佸埌杩滅▼浣跨敤github(gh-pagesbranch)鏄剧ず鍓嶇闈欐€侀〉闈㈠弬鑰冨崥瀹㈠洯鏂囩珷http://www.cnblogs.com/qianmo...gitregretoperation-resetrevertcheckoutreset鎸囧悜褰撳墠鍒嗘敮鐨勬湯灏炬寚鍚戞煇娆℃彁浜わ紝鍙互鏄敤浜庣Щ闄ゆ彁浜ゅ悗鐨勬彁浜わ紙鎻愪氦鍚庣殑鎻愪氦鍦╬ush鍚庝笉浼氬瓨鍦ㄤ簬杩滅▼鐗堟湰璁板綍涓紝鍙湁鏈湴鐗堟湰璁板綍杩欏嚑鏉ommit锛塯itreflog//鎵惧埌瑕佽繑鍥炵殑鐗堟湰鐨刢ommit_idgitreset--hardcommit_id//鐗堟湰鍘嗗彶鍥炴粴鍒版寚瀹氱殑commit锛屽彇娑堝綋鍓嶇殑commit銆傚ご銆傜孩瀛楀彉鎴愮┖锛堟挙閿€瀵瑰伐浣滃尯鐨勪慨鏀癸級gitcheckout銆俫itcheckoutdirectorygitcheckoutfilereset涓変釜鍙傛暟--soft--缂撳瓨鍖哄拰宸ヤ綔鐩綍閮戒笉浼氭敼鍙?-mixed--榛樿閫夐」銆傜紦瀛樺尯涓庝綘鎸囧畾鐨刢ommit鍚屾锛屼絾宸ヤ綔鐩綍涓嶅彈褰卞搷--hard鈥撶紦瀛樺尯鍜屽伐浣滅洰褰曢兘鍚屾鍒颁綘鎸囧畾鐨刢ommit/鍒囨崲鍒版湰娆℃彁浜ょ殑浠ｇ爜锛屼涪寮冧慨鏀瑰嵆鍙湪宸ヤ綔鐩綍涓婏細gitcheckout銆?/涓㈠純瀵瑰伐浣滅洰褰曠殑鎵€鏈変慨鏀筭itcheckoutjs/component/extendExport.js//鍙涪寮冨璇ユ枃浠剁殑淇敼revertgitrevertcommit_id鏍规嵁鍘嗗彶璁板綍鍒涘缓涓€涓柊鐨勬彁浜ゃ€俢ommit鍚庣殑璁板綍杩樺湪repository涓紝鍙槸浠ｇ爜娌℃湁浜嗐€備富鍒嗘敮gitrevert鎿嶄綔鍚庯紝閮ㄥ垎鍒嗘敮commit鏃犳硶鍚堝苟鍒颁富鍒嗘敮锛屽洜涓轰富鍒嗘敮宸茬粡鍦ㄥ姛鑳藉垎鏀箣鍓嶃€備娇鐢ㄥ満鏅細master鍒嗘敮涓€鑸笉鍏佽git鎿嶄綔锛屽彧鑳絤erge锛屾墍浠ョ敤杩欎釜鍔熻兘鏉ヨ繘琛岀増鏈洖婊氥€俫itresetcommitlevel/filelevel涓㈠純绉佹湁鍒嗘敮涓婁竴浜涙湭鎻愪氦鐨勬洿鏀?浠庣紦瀛樹腑鍒犻櫎鏂囦欢gitcheckoutcommitlevel/鏂囦欢绾у垏鎹㈠垎鏀垨鏌ョ湅鏃х増鏈?涓㈠純宸ヤ綔鐩綍涓殑淇敼gitrevertcommitlevel鍥炴粴鍏叡鍒嗘敮涓婄殑鏇存敼reset杩滅▼鍒嗘敮gitreflog鏌ョ湅鎻愪氦鐗堟湰鍙穏itreset--hardcommit_id鍥炴粴鏈湴浠撳簱鍚庡己鍒舵帹閫佸埌杩滅▼鍒嗘敮锛歡itpush-f娉ㄦ剰锛氭湰鍦板垎鏀洖婊氬悗锛岀増鏈細婊炲悗瀵逛簬杩滅▼鍒嗘敮锛屽繀椤讳娇鐢ㄥ己鍒秔ush瑕嗙洊杩滅▼鍒嗘敮锛屽惁鍒欐棤娉昿ush鍒拌繙绋嬪垎鏀坊鍔犲拷鐣ユ枃浠舵儏鍐典竴锛氶渶瑕佸拷鐣ョ殑鏂囦欢杩樻病鏈夎git璺熻釜鍒帮紙鍙兘鏄柊鍒涘缓鐨勬枃浠讹級瑙ｅ喅鏂规硶锛氳繖绉嶆儏鍐靛緢绠€鍗曪紝鍙鍦?gitignore涓姞鍏ヤ竴琛屽拷鐣ヨ鍒欏嵆鍙儏鍐?锛氳蹇界暐鐨勬枃浠跺凡缁忚git璺熻釜鍒帮紙鎴戞兂鏆傛椂蹇界暐鐨勬枃浠讹級闂鍦板潃https://segmentfault.com/q/10...html-test/.env鍦ㄧ洰褰曚笅娣诲姞涓€涓枃浠跺悕gitupdate-index--assume-unchangedhtml-test/.envgit鏍囩git濡備綍鏍囪鍛戒护琛岋紵http://www.jianshu.com/p/dab7...tag鎻愪氦鐢熶骇鐜鐨勭増鏈彿锛宼agging琛ㄧず鐗堟湰浼氶儴缃插埌鐢熶骇鐜鏂板缓taggittag-av1.0-m鈥淩eleaseversion1.0鈥?/Createlocaltaggitpushorigin--tags(orgitpushoriginv1.0)localtagpushtoremote--tags鎻愪氦鎵€鏈夋爣绛惧埌鏈嶅姟鍣ㄦ垨鑰呯洿鎺ュ姞涓婃爣绛惧悕鍗虫彁浜ゆ爣绛惧埌鏈嶅姟鍣╣ittag-l-n//鍒楀嚭鎵€鏈夌殑鏍囩鍜岃瘎璁猴紝gittag鍙兘鍒楀嚭鏍囩鍒楄〃锛屼笉浼氭樉绀鸿瘎璁篋eletetagdeletelocaltaggittag-dtagNamedeleteremotetaggitpushorigin:refs/tags/鏍囩鍚嶄娇鐢╨inux鍛戒护grep杩涜鏍囩妯＄硦鏌ヨgittag|grepdev_20180124妯＄硦鏌ヨ鎵€鏈夊寘鍚玠ev_20180124鏍囩鍚嶇殑鍚嶇Оgitfetch鍜実itpullgitfetch+gitmergegitfetchoriginmaster//灏嗚繙绋嬫媺鍙栦慨鏀瑰埌thelocalgitdifforigin/master//鏌ョ湅鏈湴鍒嗘敮鍜岃繙绋嬪垎鏀殑鍖哄埆gitmerge//鍚堝苟杩滅▼鍒嗘敮鍜屾湰鍦板垎鏀痝itfetch鍜実itpull閮戒粠杩滅▼鎷夊彇鏈€鏂颁唬鐮佸埌鏈湴gitfetch:gitfetch鑾峰彇鎵€鏈夊垎鏀殑鏇存柊濡傛灉鍙兂鑾峰彇鍥哄畾鍒嗘敮鐨勬洿鏂帮紝鍙互鎸囧畾鍒嗘敮鍚嶆潵鑾峰彇瀛樺偍鍦?pull妫€绱㈣繙绋嬩富鏈哄垎鏀殑鏇存柊锛岀劧鍚庡皢鍏朵笌鎸囧畾鐨勬湰鍦板垎鏀悎骞躲€俫itpulloriginmaster===gitfetchoriginmaster+gitmerge=========================================================================================================================================================================================================================================================鏈湴涓绘満杩斿洖鐨勬洿鏂板簲璇ヤ互鈥滆繙绋嬩富鏈哄悕/鍒嗘敮鍚嶁€濈殑褰㈠紡璇诲彇銆傛瘮濡傚湪origin涓绘満鐨刴aster鍒嗘敮涓婏紝闇€瑕佷娇鐢╫rigin/master鏉ヨ鍙栨姄鍙栫殑鍐呭銆傚彲浠ヤ娇鐢ㄥ涓嬫搷浣済itcheckoutorigin/master锛堝嵆鍒囨崲鍒颁互褰撳墠鎻愪氦鐨勭増鏈彿鍛藉悕鐨勫垎鏀級濡備笅鍥撅細easygit:(e0078ea)gitbranch-a妫€鏌ュ悗锛屽垏鎹㈠洖master鍒嗘敮锛岀劧鍚巑ergegitcheckoutmastergitmerge灏嗘姄鍙栫殑鍐呭鍚堝苟鍒版湰鍦癿aster鍒嗘敮銆俫itrebeaseorgitmergemergeandrebasemerge:yes鍚堝苟forkedparties涓庡叾鏈€杩戠殑鍏卞悓绁栧厛锛岀劧鍚庣敓鎴愪竴涓柊鐨刢ommitrebase:灏嗙洰鏍囧垎鏀悎骞跺埌杩欎釜鍒嗘敮涓紝涓嶄細鐢熸垚鏂扮殑commit锛屼富骞插垎鏀湅璧锋潵鍍忎竴鏉＄嚎commit,commithistory鍚堝苟鍚庣殑鍒嗘敮姣旇緝骞插噣锛宺ebase鏄嚎鎬х殑锛岃€屽悎骞跺悗鐨勫垎鏀樉绀轰簡閿欑患澶嶆潅鐨剅ebase瀛︿範鐜妭銆俽ebase瀛︿範rebase鐨勫姛鑳界畝鍗曟鎷涓嬶細鍙互缂栬緫銆佸垹闄ゃ€佸鍒躲€佺矘璐翠竴瀹氱殑绾挎€ф彁浜ゅ巻鍙诧紱鍥犳锛屽悎鐞嗙殑浣跨敤rebase鍛戒护鍙互璁╂垜浠殑commit鍘嗗彶鍙樺緱骞插噣绠€娲侊紒rebase鍩烘湰鎿嶄綔gitrebasemaster//涓€瀹氳鍦ㄥ彧鏈変綘鑷繁淇敼鐨勭壒鎬у垎鏀笂鎵ц杩欐潯鍛戒护//灏嗘暣涓壒鎬у垎鏀Щ鍒癿aster鍒嗘敮鍚庨潰锛屾湁鏁堝悎骞秏aster鍒嗘敮涓婄殑鏂版彁浜?/rebase閲嶅啓鎵€鏈夊湪鐗规€у垎鏀笂鎻愪氦锛屼笉浼氫骇鐢熷悎骞舵彁浜itcheckoutmastergitmergedev_xxx//鐜板湪鍥炲埌master鍒嗘敮鍋氫竴涓揩杩涘悎骞躲€傝繖绉嶈嚜鍔╮ebase涓嶄細鍘婚櫎鍐椾綑鐨勬彁浜や俊鎭紝鍙細璁﹎aster鐨勬彁浜ゅ巻鍙插彉鎴愮嚎鎬х殑銆備氦浜掑紡鍙樺熀鎿嶄綔gitlog--oneline//鍦ㄤ竴琛屼腑鏄剧ず鎻愪氦淇℃伅gitrebase-imaster灏嗘墦寮€涓€涓獀im鏂囨湰缂栬緫鍣╬ick33d5b7aMessageforcommit#1pick9480b3dMessageforcommit#2pick5c67e61Messageforcommit#3-Changethepick鍒颁綘闇€瑕佺殑鎿嶄綔鈥斺€旈€氬父浣跨敤squash锛堟尋鍘嬶級鈥斺€旀枃鏈敞閲婇儴鍒嗕负鎴戞彁渚涗簡浠ヤ笅娉ㄩ噴閫夋嫨锛歳eservedThecommit锛堢缉鍐欙細p锛塺eword锛氫繚鐣檆ommit锛屼絾鎴戦渶瑕佷慨鏀筩ommit鐨勬敞閲婏紙缂╁啓锛歳锛夌紪杈戯細淇濈暀鎻愪氦锛屼絾鎴戞兂鍋滄骞朵慨鏀规彁浜わ紙涓嶄粎浠呮槸娉ㄩ噴锛夛紙缂╁啓锛歟锛夊帇缂╋細灏嗘鎻愪氦涓庝笂涓€涓彁浜ゅ悎骞讹紙缂╁啓锛歴锛変慨澶嶏細鍚堝苟姝ゆ彁浜や笌涓婁竴娆℃彁浜わ紝浣嗘垜涓嶆兂淇濈暀璇ユ彁浜ょ殑娉ㄩ噴淇℃伅锛堢缉鍐欙細f锛塭xec锛氭墽琛宻hell鍛戒护锛堢缉鍐欙細x锛塪rop锛氭垜鎯充涪寮冭鎻愪氦锛堢缉鍐欙細d锛?:wq淇濆瓨閫€鍑哄悗锛屼細鍐嶆鎵撳紑涓€涓枃鏈紪杈戝櫒锛岀劧鍚庡彲浠ヤ慨鏀规敞閲婁俊鎭紝淇濈暀浣犳兂淇濈暀鐨刢ommit淇℃伅锛屽叾浣欏垹闄わ紙绀烘剰鍥惧涓嬶級-鐒跺悗浣跨敤`gitlog--oneline`鎻愪氦鏂扮殑璇勮淇℃伅锛屽彧鐣欎笅鍒氭墠鍓╀笅鐨勭紪杈戙€俫itcheckoutmastergit鍚堝苟鍔熻兘浠ユ煡鐪嬬嚎鎬ф彁浜ゅ巻鍙茶褰曘€備氦浜掑紡rebase淇敼璇勮淇℃伅榛樿浼氭墽琛実itpull瀵逛簬涓€娆″悎骞讹紝鍙互浣跨敤gitpull--rebase锛屼笉浼氫骇鐢熷浣欑殑鍚堝苟銆俫itpull--rebase鐩稿綋浜巊itfetch+gitrebase銆傛彁浜ゅ拰鎾ら攢commit锛屽苟涓轰綘鎶婅繖浜涙敼鍔ㄦ殏瀛樺湪.git/rebase鐩綍涓紝鐒跺悗灏嗘竻绌虹殑feature鍒嗘敮鏇存柊涓簃aster鍒嗘敮鐘舵€侊紝鏈€鍚庡皢鍒氭墠涓存椂淇濆瓨鐨勬敼鍔ㄥ簲鐢ㄥ埌鍒嗘敮涓婄殑synchronizedfetaure涓€傝繖鍏呭綋鈥滃彉鍩衡€濓紝骞朵笖姝ゆ洿鏀逛粠鎻愪氦鐨勬渶鍚庝竴涓叕鍏遍儴鍒嗗紑濮嬨€傝繖灏辨槸涓轰粈涔堝畠琚О涓衡€渞ebase鈥濄€?銆乵erge鍜宺ebase鐨勭粨鏋滃畬鍏ㄤ竴鏍枫€?銆乺ebase鈥渞ebase鈥濆悗鐨刢ommit鍜屾病鏈塺ebase涔嬪墠鐨刢ommit鏄笉涓€鏍风殑銆傚畠浠殑SHA-1鍊间笉鍚岋紝Git浼氭妸瀹冧滑褰撲綔涓ゆ鎻愪氦銆傜幇鍦ㄥ浜哄崗浣滅殑寮€婧愰」鐩櫘閬嶄娇鐢╮ebase锛堝嵆鍦ㄦ彁浜ゅ墠瀵逛富鍒嗘敮杩涜rebase锛夈€傝繖鍏跺疄鐩稿綋浜庡府浣滆€呭鐞嗕簡鍐茬獊銆傜瑪鑰呴厤鍚堜唬鐮佹椂锛屾洿瀹规槗鍦ㄦ湰鍦拌繘琛屾竻鐞嗏€斺€斾慨鏀规彁浜ゅ巻鍙测€斺€攁mend淇敼鏈€鏂扮殑鎻愪氦淇℃伅gitcommit--amend//杩涘叆vim缂栬緫鍣紝鐢?wq淇濆瓨骞跺畬鎴愪慨鏀瑰鏋渃ommit宸茬粡鎺ㄩ€佸埌杩滅▼锛岄渶瑕佷娇鐢╣itpush-fgitrebase-iHEAD~3//鏌ョ湅缁撴潫涓夋鎻愪氦锛屽儚涓婇潰鐨勪氦浜掑紡rebase锛屼慨鏀规彁浜ゅ巻鍙瞞ergevsrebasemerge鏄畨鍏ㄦ搷浣滐紝鐜版湁鍒嗘敮submissions涓嶄細琚慨鏀癸紝merge浼氬鐢熸垚涓€涓猚ommit锛屽悎骞跺悇涓垎鏀殑commit銆傚畠灏嗙敓鎴愬鏉傜殑鍘嗗彶鎻愪氦琛屻€俁ebase浼氬皢涓诲垎鏀柊鐢熸垚鐨勬彁浜ょЩ鍒癴eature鍓嶉潰銆俧eature鍚堝苟鍒癿aster鍚庯紝浼氱敓鎴愪竴涓嚎鎬х殑鍘嗗彶鎻愪氦绾裤€傛偍杩樺彲浠ヤ慨鏀瑰巻鍙叉彁浜よ褰曘€傛€荤粨锛氬鏋滀綘鎯虫嫢鏈変竴涓共鍑€鐨勩€佺嚎鎬х殑鎻愪氦鍘嗗彶锛屾病鏈変笉蹇呰鐨勫悎骞舵彁浜わ紝浣犲簲璇ヤ娇鐢╣itrebase鑰屼笉鏄痝itmerge鏉ュ悎骞舵潵鑷叾浠栧垎鏀殑鏇存敼銆傚鏋滀綘鎯充繚鐣欓」鐩殑瀹屾暣鍘嗗彶骞堕伩鍏嶅湪鍏叡鍒嗘敮涓婇噸鍐欐彁浜わ紝浣犲彲浠ヤ娇鐢╣itmerge銆傝繖涓や釜閫夐」閮藉緢濂界敤锛屼絾鑷冲皯浣犵幇鍦ㄥ彲浠ラ€夋嫨gitrebase銆俫itcherry-pickcommit_idcherry:馃崚,git涓轰綘绮炬寫缁嗛€夝煃掍娇鐢ㄥ満鏅細鎴戞兂鎶婃煇涓猚ommit锛堝湪浠绘剰涓€涓垎鏀笂锛夋斁鍒颁綘闇€瑕佺殑鍒嗘敮涓婇棶棰橈細浠婂ぉ閬囧埌涓€涓棶棰橈細鍚屼簨璧颁簡锛屼絾鏄粬杩樻湁鏈彂甯冪殑闇€姹傦紙宸茬粡鍙戝埌娴嬭瘯鐜浜嗭級锛屼絾鏄粬鐨勫紑鍙戝垎鏀繕娌℃湁鎺ㄩ€佸埌杩滅▼锛岀幇鍦ㄤ笂绾夸簡锛屾壘涓嶅埌浠栫殑寮€鍙戝垎鏀紝鎵€浠ヤ笉鑳藉彂甯冿紙鐪熸槸楠楀瓙鍟婏級瑙ｅ喅鏂规硶锛氭牴鎹甤ommit娉ㄩ噴淇℃伅浠巘est寮€濮嬩緷娆℃壘鍑轰粬鎵€鏈夌殑commitid锛岀劧鍚庡湪鏂扮殑鍒嗘敮涓婁粠澶村埌灏句緷娆℃墽琛実itcherry-pickcommit_id锛屾妸socommitpick鍒颁綘鐨勬柊鍒嗘敮涓婅繖鏍锋搷浣滃氨鍙互浜唃enerateanewcommit(anewcommit_id)gitwarehousemigrationgitclone[oldwarehouseaddress]#鎷夊彇鏃т粨搴撶殑鎵€鏈夊垎鏀唬鐮乬itbranch-r|grep-v'\->'|鍚屾椂璇诲彇杩滅▼锛涘仛gitbranch--track"${remote#origin/}""$remote";donegitfetch--allgitpull--all#淇敼鏈湴浠ｇ爜浠撳簱鐨勮繙绋嬫簮鍦板潃鎸囧悜鏂扮殑杩滅▼婧愬湴鍧€#鏂板缓涓€涓┖鐧戒粨搴擄細git@gitlab.hupu.com:HPLiveFront/live-pc.gitgitremoteset-urlorigin[鏂颁粨搴撳湴鍧€濡俔gitpush--all#瀹屾垚鍏朵粬绯荤粺鎿嶄綔/linux鍛戒护鑷姩鐢熸垚鏂囦欢鐩綍缁撴瀯brewinstalltr鈥嬧€媏e瀹夎甯哥敤鍛戒护:tree-a//鏌ョ湅鍏ㄩ儴鏌愪釜鏂囦欢鏍戜笅鐨勬枃浠?d//鍙樉绀烘枃浠跺す鏍?Ln//鏄剧ず椤圭洰鐨勭n绾ф爲-I"node_module|dist"//鐢ㄦ潵杩囨护涓嶆兂鏄剧ず鐨勬枃浠舵垨鏂囦欢澶规爲>tree.md//灏嗙粨鏋滆緭鍑哄埌瀵瑰簲鏂囦欢
