Rajat Nair RajatNair

## post-receive
#!/bin/bash

target_branch="production"
working_tree="PATH_TO_DEPLOY"

while read oldrev newrev refname
do
    branch=$(git rev-parse --symbolic --abbrev-ref $refname)
    if [ -n "$branch" ] && [ "$target_branch" == "$branch" ]; then


## p4merge-git-tool.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                RajatNair
                / p4merge-git-tool.md
            
            
              Last active
              May 30, 2018 12:08
                — forked from dgoguerra/p4merge-git-tool.md
            
              
                Setup p4merge as difftool and mergetool on Windows
              
          
    Setting up p4merge
as diff and merge tool on Windows. Tried for Git version 1.8.4.msysgit.0.
Two alternatives are explained: using the command line, and directly editing the config file.
Setting up from the command line

Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:
$ git config --global diff.tool p4merge
	#!/bin/bash

	target_branch="production"
	working_tree="PATH_TO_DEPLOY"

	while read oldrev newrev refname
	do
	branch=$(git rev-parse --symbolic --abbrev-ref $refname)
	if [ -n "$branch" ] && [ "$target_branch" == "$branch" ]; then