nvk

# get's branch, fetches origin, resets.
alias gifu='branch=$(git rev-parse --abbrev-ref HEAD) && git fetch origin && git reset --hard origin/$branch'

nvk

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (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.

nvk

### Instructions source http://tumblr.intranation.com/post/766290743/using-dropbox-git-repository ####

-- make empty repo on dropbox:
	cd ~/Dropbox/RipeApps/Git
	mkdir -p newname.git
	cd !$
	git --bare init

-- push your junk into it
	cd ~/Projects/myrepo

nvk

#!/usr/bin/env bash

##
# Install:
#   curl -sL https://raw.github.com/gist/2108403/fast.sh | sh
#
# Share your feedbacks on:
#   https://gist.github.com/2108403
#
# Author: @DAddYE (Twitter/Github)

nvk

#!/usr/bin/env sh

##
# This is script with usefull tips taken from:
#   https://github.com/mathiasbynens/dotfiles/blob/master/.osx
#
# install it:
#   curl -sL https://raw.github.com/gist/2108403/hack.sh | sh
#