git
時々ど忘れしてしまうので、自分用にメモ。 > git branch * develop master > git checkout -b feature/specHoge Switched to a new branch 'feature/specHoge' # なんやかんや > git checkout develop Switched to branch 'develop' > git merge feature/sp…
.gitconfig に以下を記述する。 [diff] tool = WinMerge [difftool "WinMerge"] path = C:/Program Files/WinMerge/WinMergeU.exe cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -f \"*.*\" -e -u -r \"$LOCAL\" \"$REMOTE\" [alias] windiff = diffto…
