The Artima Developer Community
Articles | News | Weblogs | Books | Forums
Artima Forums | Articles | Weblogs | Java Answers | News
Sponsored Link •

Java Buzz Forum
Configure diffmerge with git

0 replies on 1 page.

Welcome Guest
  Sign In

Go back to the topic listing  Back to Topic List Click to reply to this topic  Reply to this Topic Click to search messages in this forum  Search Forum Click for a threaded view of the topic  Threaded View   
Previous Topic   Next Topic
Flat View: This topic has 0 replies on 1 page
Andrej Koelewijn

Posts: 594
Nickname: andrejk
Registered: Nov, 2002

Andrej Koelewijn is a Java and Oracle consultant
Configure diffmerge with git Posted: Jan 8, 2010 7:03 AM
Reply to this message Reply

This post originated from an RSS feed registered with Java Buzz by Andrej Koelewijn.
Original Post: Configure diffmerge with git
Feed Title: Andrej Koelewijn
Feed URL: http://feeds.feedburner.com/AndrejKoelewijn
Feed Description: On Oracle, Java and OpenSource 		Latest Java Buzz Posts
Latest Java Buzz Posts by Andrej Koelewijn
Latest Posts From Andrej Koelewijn

Advertisement
Use the following to configure git to use diffmerge for diffing and merging files: git config --global diff.tool diffmerge git config --global difftool.diffmerge.cmd "diffmerge \"\$LOCAL\" \"\$REMOTE\"" git config --global merge.tool diffmerge git config --global mergetool.diffmerge.cmd diffmerge --merge --result=\"\$MERGED\" \"\$LOCAL\" \"\$BASE\" \"\$REMOTE\" git config --global mergetool.diffmerge.trustexitcode false The following will show diffmerge with the two versions of myfile.java side by side: git difftool [...]

Read: Configure diffmerge with git

Topic: Bob Martin has released FitNesse 20100103. Previous Topic   Next Topic Topic: WSJ says Apple multimedia tablet gadget slated for January; Sprint jumps into e-reader fray
Sponsored Links


Google
  Web Artima.com   

Copyright © 1996-2019 Artima, Inc. All Rights Reserved. - Privacy Policy - Terms of Use