Skip to content

Instantly share code, notes, and snippets.

View garymcleanhall's full-sized avatar

Gary McLean Hall garymcleanhall

106 followers · 3 following
View GitHub Profile
@garymcleanhall
garymcleanhall / git-difftool-batch
Last active March 1, 2017 17:21
echo off
REM PARAMS: $LOCAL $REMOTE
set local=%1
set remote=%2
set p4mergepath="c:/program files/perforce/p4merge.exe"
set emptyfile="%userprofile%\.empty"
@garymcleanhall
garymcleanhall / git-mergetool-batch
Last active March 1, 2017 17:21
echo off
REM PARAMS: $BASE $LOCAL $REMOTE $MERGED
set base=%1
set local=%2
set remote=%3
set merged=%4
set nul="nul"
@garymcleanhall
garymcleanhall / git-config-aliases
Last active August 11, 2016 18:45
[alias]
lol = log --graph --decorate --pretty=oneline --abbrev-commit master origin/master
up = pull --rebase
save = !git add -A && git commit -m 'SAVEPOINT'
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
@garymcleanhall
garymcleanhall / git-config-mergetools
Last active March 1, 2017 17:13
[merge]
tool = p4merge
[diff]
tool = p4merge
guitool = vimdiff
[difftool "p4merge"]
cmd = \"~/difftool.bat\" $LOCAL $REMOTE
[difftool]
prompt = false
[mergetool "p4merge"]
@garymcleanhall
garymcleanhall / git-training-links.md
Last active August 11, 2016 07:16
Git Training Cheatsheet