YingVickyCao

1 How to get the code from the remote repository, then commit your code to remote repositoryGet the code from the remote repository.When clone, not need the user name and pwd. But git push com

上一篇文章介绍了git冲突后的处理，这篇文章说明如果使用gvimdiff工具处理冲突：在使用前，我们先配置下vim参数，读取根目录下的.vimrc文件，加入下面几行：Shell123456789set laststatus=2 "show the status lines

git config --global diff.tool vimdiffgit config --global difftool.prompt falsegit config --global merge.tool vimdiffgit config --global mergetool.prompt falsegit config --global alia

http://blog.youkuaiyun.com/redguardtoo/article/details/9076961If you are already a vim and git master and you are impatient, please jump to theQuick start section at the end of this article.

技巧：Vimdiff 使用转载地址：http://www.ibm.com/developerworks/cn/linux/l-vimdiff/各种 IDE 大行其道的同时，传统的命令行工具以其短小精悍，随手可得的特点仍有很大的生存空间，这篇短文介绍了一个文本比较和合并的小工具：vimdiff。希望能对在 Unix/Linux 系统上进行开发的朋友有所帮助。

http://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/Using vimdiff as a git mergetool can be pretty confusing - multiple windows and little explanation. This is a short tutorial which expl

http://blog.youkuaiyun.com/zcube/article/details/42298529[html] view plain copy 实用的vim下比较两个文件命令：    1、 vimdiff file1 file2  终端下输入该命令进入vim，垂直分隔窗口进行比较    2、 vimdiff -o fi

Viewing all `gitdiffs` with vimdiff  git config --globaldiff.tool vimdiffgit config --globaldifftool.prompt falsegit config --globalalias.d difftoolgit config diff.toolvimdiff use git di