2012-09-11

Git with Vimdiff

One time view:

git difftool --tool=vimdiff --no-prompt <filename>

Always:

git config --global diff.tool vimdiff
git config --global merge.tool vimdiff

For Single Repository:

git config diff.tool vimdiff
git config merge.tool vimdiff

To avoid having Git prompt when launching Vimdiff:

git config --global difftool.prompt false
Standard

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google photo

You are commenting using your Google account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s