Skip to content

Instantly share code, notes, and snippets.

Avatar

Mike Michaelis mikemichaelis

View GitHub Profile
@mikemichaelis
mikemichaelis / cloudSettings
Created Jan 20, 2018
Visual Studio Code Settings Sync Gist
View cloudSettings
{"lastUpload":"2018-01-20T00:46:03.501Z","extensionVersion":"v2.8.7"}
@mikemichaelis
mikemichaelis / gist:4f6d62a03300a24e97c1d19b9413371e
Created Apr 19, 2017
Setup p4merge as git mergetool in Windows (cmd & PS)
View gist:4f6d62a03300a24e97c1d19b9413371e
git config --global merge.tool p4merge
git config --global mergetool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"
@mikemichaelis
mikemichaelis / gist:827a48367c7fa134c608d9abe6d01384
Last active Apr 18, 2017
update all packages inside package.json to their latest version
View gist:827a48367c7fa134c608d9abe6d01384
npm update -D && npm update -S
https://docs.npmjs.com/files/package.json#dependencies
https://docs.npmjs.com/misc/semver
View Initial Git Setup
FIRST:
On Windows with $HOME mapped to a network drive, global .gitconfig can exist in multile places.
When using the Windows command shell, batch scripts or Windows programs, the file will be read from:
%USERPROFILE%\.gitconfig
However, when you're using Gi msys (bash) this will be read from
$HOME/.gitconfig
@mikemichaelis
mikemichaelis / gist:984f3d82ad697545a57af6dda209b234
Created Feb 13, 2017
"Your branch is ahead of 'origin/master'" and it is not.....
View gist:984f3d82ad697545a57af6dda209b234
git reset --hard origin/master
@mikemichaelis
mikemichaelis / gist:bdae9404ef5658e9f78ca919ed1bee20
Created Dec 27, 2016
Create a publish branch with a single commit
View gist:bdae9404ef5658e9f78ca919ed1bee20
git branch publish
git checkout publish
git log --oneline
git rebase --root -i
You can’t perform that action at this time.