Marcel Nakamine marceltn
marceltn
/ p4merge install
Last active
February 25, 2018 21:15
— forked from AaronGhent/p4merge install
Installs p4merge on a linux based machine
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # p4merge for 64 bit | |
| ``` | |
| wget http://www.perforce.com/downloads/perforce/r17.3/bin.linux26x86_64/p4v.tgz | |
| ``` | |
| # p4merge for 32 bit | |
| ``` | |
| wget http://www.perforce.com/downloads/perforce/r17.3/bin.linux26x86/p4v.tgz | |
| ``` |
marceltn
/ git_proxy_functions_v2.sh
Last active
March 28, 2018 23:29
— forked from garystafford/git_proxy_functions_v2.sh
v2 of Gist for blog post 'Revised Configuration of Git for Windows on a Corporate Network with Vagrant'. Easily turn proxy-related settings on and off for Git for Windows. 1) Add these functions to your ~\.bashrc file, 2) Change PROXY_SERVER, and PORT default values, 3) Open new Git Bash interactive shell window and execute function before using…
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # configure proxy for git while on corporate network | |
| function proxy_on(){ | |
| # assumes $USERDOMAIN, $USERNAME, $USERDNSDOMAIN | |
| # are existing Windows system-level environment variables | |
| # assumes $PASSWORD, $PROXY_SERVER, $PROXY_PORT | |
| # are existing Windows current user-level environment variables (your user) | |
| # environment variables are UPPERCASE even in git bash |