sbrl-github/bin
1
0
Fork 0
mirror of https://github.com/sbrl/bin.git synced 2018-01-10 21:33:46 +00:00
Code Activity

Optionally set up meld as the default merge tool if a display is present (ssh sessions don't have a display)

Browse source
This commit is contained in:
Starbeamrainbowlabs 2017-05-08 11:56:02 +02:00
parent 034ed9847c
commit 3d8b2b6d32
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
envsetup
View file

@ -18,5 +18,11 @@ git config --global push.default simple
## Set the username & email address ## Set the username & email address
git config --global user.name "Starbeamrainbowlabs" git config --global user.name "Starbeamrainbowlabs"
git config --global user.email "sbrl@starbeamrainbowlabs.com" git config --global user.email "sbrl@starbeamrainbowlabs.com"
# If we've got a display, then set up meld too
if [[ "$DISPLAY" != "" ]]; then
git config --global merge.tool meld
fi
## Add gitignore.io .gitignore file generator ## Add gitignore.io .gitignore file generator
git config --global alias.ignore '!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi' git config --global alias.ignore '!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi'