Either:
- Clone the repo using the format git@github.com:username/repo.git
- Run
mate .git/configand change the origin url to the git@github.com format
| MANIFEST | |
| Pods/ | |
| build/ | |
| dist/ | |
| .svn | |
| .DS_Store | |
| .ruby-* | |
| *.swp | |
| *.o | |
| *.pyc |
| *.gem | |
| *.rbc | |
| *.sassc | |
| .bundle | |
| .config | |
| .yardoc | |
| .rvmrc | |
| .rspec | |
| .sass-cache | |
| .DS_Store |
Either:
mate .git/config and change the origin url to the git@github.com formatFileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
| 'use strict'; | |
| // Include gulp | |
| var gulp = require('gulp'); | |
| var _ = require('lodash'); | |
| // Include our plugins | |
| var gutil = require('gulp-util'); | |
| var flatten = require('gulp-flatten'); | |
| var modernizr = require('gulp-modernizr'); |
| # alias e=mate | |
| # VISUAL="mate -w" | |
| # export VISUAL | |
| # export EDITOR='subl --new-window --wait' | |
| # export VISUAL='subl --new-window --wait' | |
| # alias e='subl --new-window' | |
| # export EDITOR='vim' | |
| # export VISUAL='vim' |
| { | |
| "ruby": "~/.rvm/bin/rvm-auto-ruby", | |
| "save_on_beautify": false, | |
| "tab_size": 2, | |
| "translate_tabs_to_spaces": true | |
| } |