Skip to content

Instantly share code, notes, and snippets.

View mikemichaelis's full-sized avatar

Mike Michaelis mikemichaelis

View GitHub Profile
git checkout <branch>
git tag -a v1.4 -m "[PLATFORM] publish vx.y.z"
git merge --squash <branch to merge into current branch>
git add --all
git commit -a -m "Merged some other branch"
git clone https://dassedev.visualstudio.com/Common/_git/x-ng2-seed <your project name>
rm -rf .git <delete .git>
git init
<create your new online project repository>
git remote add origin <url of project repository>
git add --all
git commit -m'Setup'
git remote add upstream https://dassedev.visualstudio.com/Common/_git/x-ng2-seed
git fetch upstream
git merge upstream/master --allow-unrelated-histories
git commit --allow-empty
@mikemichaelis
mikemichaelis / gist:bdae9404ef5658e9f78ca919ed1bee20
Created December 27, 2016 18:30
Create a publish branch with a single commit
git branch publish
git checkout publish
git log --oneline
git rebase --root -i
git tag -a v1.4 -m "[message]"
@mikemichaelis
mikemichaelis / gist:984f3d82ad697545a57af6dda209b234
Created February 13, 2017 15:57
"Your branch is ahead of 'origin/master'" and it is not.....
git reset --hard origin/master
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:827a48367c7fa134c608d9abe6d01384
Last active April 18, 2017 15:11
update all packages inside package.json to their latest version
npm update -D && npm update -S
https://docs.npmjs.com/files/package.json#dependencies
https://docs.npmjs.com/misc/semver
npm show angular2-busy@* version