Skip to content

Instantly share code, notes, and snippets.

View SvetlovNK's full-sized avatar

Nickolay Svetlov SvetlovNK

View GitHub Profile
'use strict';
var gulp = require('gulp'),
watch = require('gulp-watch'),
prefixer = require('gulp-autoprefixer'),
uglify = require('gulp-uglify'),
sass = require('gulp-sass'),
sourcemaps = require('gulp-sourcemaps'),
rigger = require('gulp-rigger'),
cssmin = require('gulp-minify-css'),
@smoll
smoll / USING-DIFFMERGE.md
Last active March 28, 2025 01:01
Using DiffMerge as your git mergetool (for Mac OS X / macOS)
[mergetool "intellij"]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm merge \
$(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") \
$(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") \
$(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") \
$(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED") \
&& read -n 1 -s
[mergetool "vscode"]
cmd = code --wait $MERGED
[merge]