![]() Git config -global '~/bin/p4mergebash. Then set git config: git config -global diff.tool p4mergebash ![]() Perforce is what we use internally at Epic, and it is now free for up to 20 users (and 20 workspaces you’ll probably end up using 2 or 3 per human user). The editor currently has source control plugins for both Perforce and SVN. Note: Ensure there are no CRLF's in p4mergebash.sh. Setup You’ll need to store your project in a supported source control system for the built-in tools to work. Insert your username into the angle brackets (i.e. R=$(echo `git rev-parse -show-toplevel`/"$REMOTE" | sed 's,/mnt/c/,C:/,g' | sed 's,/,\\\\,g')Ībove script assumes your AppData and your git repo are on C: drive. Is there any way to solve this kind of problem? (Maybe it is a more general problem: using Linux path from Windows application.)Īnyway, I do not insist on using p4merge but any similar visual tool to compare differences and to make merge possible.Īny information you can provide me would be greatly appreciated.Ĭreate file p4mergebash.sh and set $PATH: mkdir -p ~/binĮcho 'export PATH=$PATH:/mnt/c/Program\ Files/Perforce' > ~/.bashrc If I understand right, this problem may emanate from the fact that a Windows program (namely p4merge) could not find a file that is referenced with a Linux file path (e.g. the p4merge application is started right after the call but gives the following message: Error.in bash: Unable to translate current working directory.So my problem is that if I call git difftool in the bash - to investigate the changes with p4merge - I got the following messages bashrc to make it callable from anywhere: export PATH=$PATH:"/mnt/c/Program Files/Perforce" Path = /mnt/c/Program Files/Perforce/p4merge.exeĪdditionally, I added the following folder to the bash PATH variable in. gitconfig file with the following way (I adjusted the paths to be accessible from Windows 10 Ubuntu bash): I installed p4merge on Windows (followed this artice) and configured the git. I want to use a visual diff/merge tool for git. ![]() I use Windows 10 Ubuntu bash, provided by Windows Subsystem for Linux.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |