wnoguchi/.gitconfig

Created June 26, 2013 05:10

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/wnoguchi/5864932.js"></script>
Save wnoguchi/5864932 to your computer and use it in GitHub Desktop.

Download ZIP

git diffでp4mergeを使う方法。

Raw

	[diff]
	external = p4diff

Raw

p4diff

	#!/bin/bash
	P4MERGE=/usr/local/bin/p4merge
	[ $# -eq 7 ] && ${P4MERGE} "$2" "$5"

Author

wnoguchi commented Jun 26, 2013

git diffでp4mergeを使う

/usr/local/bin/p4diff

sudo chmod +x /usr/local/bin/p4diff

vi ~/.gitconfig

それで

git diff

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment