Lucho Mayta luismayta

## gist:2399497

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                luismayta
                / gist:2399497
            
            
              Created
              April 16, 2012 15:33
                — forked from ppanyukov/gist:1035407
            
              
                Using p4merge with Git Mac OS X or Ubuntu
              
          
    Git config

$ git config --global -e
[merge]
    keepBackup = false;
    tool = p4merge
[mergetool "p4merge"]
    cmd = p4merge "$BASE" "$REMOTE" "$LOCAL" "$MERGED"

keepTemporaries = false

  
## pre-commit.sh
#!/bin/bash
# PHP CodeSniffer pre-commit hook for git
#
# @author Soenke Ruempler <soenke@ruempler.eu>
# @author Sebastian Kaspari <s.kaspari@googlemail.com>
#
# see the README

PHPCS_BIN=/usr/bin/phpcs
PHPCS_CODING_STANDARD=PEAR
	#!/bin/bash
	# PHP CodeSniffer pre-commit hook for git
	#
	# @author Soenke Ruempler <soenke@ruempler.eu>
	# @author Sebastian Kaspari <s.kaspari@googlemail.com>
	#
	# see the README

	PHPCS_BIN=/usr/bin/phpcs
	PHPCS_CODING_STANDARD=PEAR