Skip to content

Instantly share code, notes, and snippets.

{
"name": "app-name",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
$ touch .gitignore
#
$ git pull --rebase
# $ git pull origin master --rebase
# in sequence
git mergetool
git add conflict_file
git rebase --continue
$ git commit -m "Something terribly misguided"
$ git reset --soft HEAD~
<< edit files as necessary >>
$ git add ...
$ git commit -c ORIG_HEAD
# Revert changes to modified files.
git reset --hard
# Remove all untracked files and directories. (`-f` is `force`, `-d` is `remove directories`)
git clean -fd
$ git init
$ git remote add origin https://yourGitURL.com/user/repo.git
# Set a new remote
$ git remote -v
# Verify new remote
origin https://yourGitURLcom/user/repo.git (fetch)
origin https://yourGitURL.com/user/repo.git (push)
# now add the files
@mkoller
mkoller / st3.json
Created May 26, 2016 21:06
Sublime Text 3 packages
{
"bootstrapped": true,
"in_process_packages":
[
],
"installed_packages":
[
"ConvertToUTF8",
"Emmet",
"JavaScript Completions",
@mkoller
mkoller / ohmy.zshrc
Created May 26, 2016 21:02
Hidden Files
alias show_hidden="defaults write com.apple.Finder AppleShowAllFiles YES && killall Finder"
alias hide_hidden="defaults write com.apple.Finder AppleShowAllFiles NO && killall Finder"
@mkoller
mkoller / npm.sh
Created May 26, 2016 20:45
npm gist
$ sudo chown -R $USER /usr/local
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->