You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2.5 KiB
2.5 KiB
鏍规嵁鎻愪緵鐨刞git diff`璁板綍锛屼互涓嬫槸閽堝浠ｇ爜鍙樻洿鐨勮瘎瀹★細
浠ｇ爜鍙樻洿鐐筡n1. 鍦╜GitCommand绫荤殑鏌愪釜鏂规硶涓紝瀵筦outputStream杩涜浜嗛噸缃搷浣滐紝骞舵坊鍔犱簡娉ㄩ噴璇存槑璇ユ搷浣滄槸涓轰簡娓呯┖杈撳嚭娴佷互缁х画澶勭悊涓嬩竴涓猟iff銆俓n2. 鍦ㄦ敞閲婁腑鎻愬埌浜嗕竴涓緟鍔炰簨椤癸紙todo锛夛紝寤鸿鍒犻櫎鏌愪釜鏂囦欢澶广�俓n
璇勫鎰忚
1. outputStream.reset()鎿嶄綔
- 浼樼偣锛氶噸缃緭鍑烘祦鏄竴涓悎鐞嗙殑鍋氭硶锛屽彲浠ョ‘淇濆湪澶勭悊涓嬩竴涓猟iff鏃讹紝杈撳嚭娴佷笉鍖呭惈涓婁竴涓猟iff鐨勬畫鐣欐暟鎹�俓n- 缂虹偣锛氶噸缃緭鍑烘祦骞朵笉鍒犻櫎娴佷腑鐨勬暟鎹紝瀹冨彧鏄噸缃祦鐨勫唴閮ㄧ姸鎬侊紝濡備綅缃�佹爣璁扮瓑銆傚鏋滆緭鍑烘祦涓寘鍚ぇ閲忔暟鎹紝杩欑鏂规硶鍙兘浼氬鑷村唴瀛樹娇鐢ㄦ晥鐜囦綆涓嬨�俓n
2. 寰呭姙浜嬮」锛坱odo锛塡n- 闂锛氭敞閲婁腑鎻愬埌鐨勨�滃簲璇ュ惂鏂囦欢澶瑰垹闄ゆ帀鈥濇病鏈夊叿浣撹鏄庤鍒犻櫎鐨勬枃浠跺す鏄粈涔堬紝涔熸病鏈夎В閲婁负浠�涔堣鍒犻櫎璇ユ枃浠跺す銆俓n- 寤鸿锛歕n - 鏄庣‘鎸囧嚭瑕佸垹闄ょ殑鏂囦欢澶瑰悕绉板拰璺緞銆俓n - 瑙ｉ噴鍒犻櫎鏂囦欢澶圭殑鍘熷洜锛屼緥濡傛槸涓轰簡娓呯悊涓存椂鏂囦欢銆侀槻姝㈡枃浠舵硠闇茬瓑銆俓n - 濡傛灉鍒犻櫎鏂囦欢澶规槸涓�涓彲閫夐」锛岃�冭檻灏嗗叾浣滀负涓�涓厤缃弬鏁帮紝鑰屼笉鏄‖缂栫爜鍦ㄤ唬鐮佷腑銆俓n - 濡傛灉鍒犻櫎鎿嶄綔纭疄鏈夊繀瑕侊紝纭繚鍦ㄥ垹闄や箣鍓嶆湁閫傚綋鐨勯敊璇鐞嗗拰澶囦唤鏈哄埗锛屼互闃叉鏁版嵁涓㈠け銆俓n
3. 浠ｇ爜椋庢牸
- 寤鸿锛氬湪娉ㄩ噴涓紝浣跨敤
//鑰屼笉鏄痐/* ... */锛屽洜涓篳//鏄崟琛屾敞閲婏紝鑰宍/* ... */`鏄琛屾敞閲娿�傚鏋滄敞閲婃槸澶氳鐨勶紝搴旇浣跨敤澶氳娉ㄩ噴椋庢牸銆俓n
鎬荤粨
浠ｇ爜涓殑閲嶇疆杈撳嚭娴佹搷浣滄槸鍚堢悊鐨勶紝浣嗛渶瑕佽繘涓�姝ユ敼杩涘緟鍔炰簨椤圭殑娉ㄩ噴锛岀‘淇濆叾鏄庣‘鎬у拰瀹屾暣鎬с�傚悓鏃讹紝寤鸿瀹℃煡浠ｇ爜椋庢牸鐨勪竴鑷存�с��