Tom Daggett tomdwp

## .gitconfig
[merge]
  keepBackup = false
	tool = p4merge
[mergetool "p4merge"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\""
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
[diff]
    tool = p4merge

## gist:561051943a69e334cc8d7694bb56eebd

      
        
          
            
              
              1 file
            
          
          
            
              
              0 forks
            
          
          
            
              
              0 comments
            
          
          
            
              
              0 stars
            
          
        
        
          
              
          
          
            
                tomdwp
                / gist:561051943a69e334cc8d7694bb56eebd
            
            
              Last active
              November 14, 2017 18:13
                — forked from philstrong/gist:83bd14a85f7bebf7fc01
            
              
                Setting up GIT Bash autocompletion. Use this only if you are using Bash instead of ZSH.
              
          
        
      
        
  
      
    To see what shell you are using, you can:
echo $SHELL
and it will tell you.
Use the below only if you are using bash.
Run the following to create ~/.git-completion.bash:
curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash > ~/.git-completion.bash
	[merge]
	keepBackup = false
	tool = p4merge
	[mergetool "p4merge"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\""
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
	[diff]
	tool = p4merge