Web Start Software

以下是一个Web开发者需要安装的软件（windows下）

• PHP
• mysql
• Atom
• Git
• WinMerge
• HeidiSQL
• Composer

巧的是，以上都是免费软件，且是开源软件

Git 初始化

git config --global user.name "Your Name"
git config --global user.email [email protected]

git config --global alias.ci commit
git config --global alias.st status
git config --global alias.co checkout

Git 和 WinMerge 合作

Using WinMerge as the git Diff/Merge Tool on Windows 64bit

[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge
    trustExitCode = true
    cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED

[diff]
    tool = winmerge

[difftool "winmerge"]
    name = WinMerge
    trustExitCode = true
    cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE

然后:

git difftool