ubuntuÏÂgitÅäÖÃdifftool ÏÂÔØ±¾ÎÄ

ubuntuÏÂgitÅäÖÃdifftool

ºÜ¶àÈËʹÓÃgit×÷Ϊ°æ±¾¹ÜÀíµÄʱºò£¬Ê¹ÓòîÒì±È½Ï¹¤¾ßÊÇgit×Ô´øµÄdiff¹¦ÄÜ£¬ ÔÚÐÞ¸ÄÄÚÈݶàµÄÇé¿öÏ£¬¿´ÆðÀ´ºÜ²»Ö±¹Û¡£ ÕâÀïÍÆ¼öʹÓÃvimdiffÀ´×ö±È½Ï£¬ ¸öÈËÖÓ°®vimÀ´²é¿´´úÂ룬ËùÒÔϰ¹ßÓÃvimµÄÅóÓѱȽÏÊʺϡ£ »¹Î´°²×°vimµÄÅóÓÑ¿ÉÒÔͨ¹ýÈçÏÂÃüÁî°²×°£º sudo apt-get install vim °²×°ÍêºóÖ»ÐèÒªÅäÖÃÈçÏ£º

git config --global diff.tool vimdiff ÕâÑù¾Í¿ÉÒÔÁË £¬ ÊDz»ÊÇÏ൱µÄ¼òµ¥£¿£¡£¡

ʹÓõÄʱºòÖ»ÐèҪʹÓÃgit difftool Ìæ»» git diff¾Í¿ÉÒÔÁË¡£

ÕâʱÄã»á·¢ÏÖ£¬Ã¿±È½ÏÒ»¸öÎļþ£¬¶¼»áÌáʾÄãÊÇ·ñLaunch vimdiff ?£¬ ÎÒÃǰÑÕâ¸öѯÎÊÈ¥µô£º git config --global difftool.prompt false

ΪÁËÊäÈë·½±ã£¬difftoolÊäÈëʵÔÚÌ«³¤£¬ ÎÒÃÇÓñðÃû d À´Ìæ´ú difftool £º

git config --global alias.d difftool

ÕâÑùÒÔºóÖ»ÐèÒªÊäÈëgit d¼´¿É£¬ ͬʱԭÀ´µÄgit diff¹¦Äܲ»ÊÜÓ°Ï죬¿ÉÒÔÕÕ³£Ê¹Óã¡

ÅäÖÃÊÇ·ñ³É¹¦¿ÉÒԲ鿴µ±Ç°µÇ¼Óû§µÄÎļþ¼ÐϵÄ.gitconfig

ÎļþÊÇ·ñÓÐÈçÏÂÅäÖÃ:

ͬÀí£¬ ÆäËûÎļþ±È½Ï¹¤¾ßÒ²¿ÉÒÔÅäÖá£