GIT TOOLS

gistfile1.txt

#OSX DIFF TOOL
#DOWNLOAD: http://www.perforce.com/downloads/20-User?qt-perforce_downloads_step_3=1#product-10
~/.giconfig 
[merge]
        keepBackup = false
        tool = custom
        
[mergetool "custom"]
        cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
        keepTemporaries = false
        trustExitCode = false
        keepBackup = false







git-up: https://github.com/aanand/git-up
git-imerge: https://github.com/mhagger/git-imerge
git-sweep: https://github.com/arc90/git-sweep



#### username
git config --global user.name "Helmut Januschka"
git config --global user.email helmut@januschka.com


#rewrite history change author: https://help.github.com/articles/changing-author-info/
git branch -r | grep -v HEAD | grep -v  master | awk -F'origin/' '{print $2 " " $1"origin/"$2}'|awk '{ print "git checkout " $1 }'|bash