garymcleanhall

#Repositories

• Git Kata

#Downloads

• Git Download
• Atlassian SourceTree
• GitHub for Windows
• Git Bash Prompt
• P4Merge
• BeyondCompare

garymcleanhall

[merge]
        tool = p4merge
[diff]
        tool = p4merge
        guitool = vimdiff
[difftool "p4merge"]
        cmd = \"~/difftool.bat\" $LOCAL $REMOTE
[difftool]
        prompt = false
[mergetool "p4merge"]

garymcleanhall

[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

echo off

REM PARAMS: $BASE $LOCAL $REMOTE $MERGED

set base=%1
set local=%2
set remote=%3
set merged=%4

set nul="nul"

garymcleanhall

echo off

REM PARAMS: $LOCAL $REMOTE

set local=%1
set remote=%2

set p4mergepath="c:/program files/perforce/p4merge.exe"

set emptyfile="%userprofile%\.empty"