Loading

2012年3月30日
Restore Deleted Files In Git
摘要： Ever been working on a project for a while, then go work on something else, then come back after a few weeks? Sure you have.Ever come back and somebody deleted your nice nginx config file you had in there for your local dev server? Ever wonder where the hell it went? Well wonder no more!I had this h 阅读全文
posted @ 2012-03-30 16:55 .net's 阅读(710) 评论(0) 推荐(0)
win与linux下git配置p4merge为合并比较工具的方法【转】
摘要： 首先去官方下载p4merge工具1.http://www.perforce.com/downloads/complete_list2.Browse by Platform>选择相应平台系统下载后安装3.安装完毕后，在安装根目录下会有一个p4merge(.exe)的文件Windows配置：在Git配置中如下配置（请自己写明p4merge路径）：.gitconfig代码[diff] tool = p4m [difftool "p4m"] cmd = cmd = \"/cygdrive/d/development/Perforce/p4merge.exe\&quo 阅读全文
posted @ 2012-03-30 11:33 .net's 阅读(1927) 评论(0) 推荐(0)