ok... I think it's "diff.external" that you shouldn't probably use
That should instead be in a mergtool and a difftool. Then, when you use "git diff ..." you'll get the "native" git diff, and when you use "git difftool ..." you'll get your "special" diff tool. a difftool is set up similar to the way you have the mergetool setup, except with less parameters. I'm not sure what the cmdline should look like for winmerge, but I'm pretty sure you can find it on the net somewhere. Kelly On Mon, Aug 22, 2011 at 12:46 PM, hammett <[email protected]> wrote: > Here it goes: > > $ git config --list > core.symlinks=false > core.autocrlf=false > color.diff=auto > pack.packsizelimit=2g > help.format=html > http.sslcainfo=/bin/curl-ca-bundle.crt > sendemail.smtpserver=/bin/msmtp.exe > user.name=hammett > [email protected] > gui.fontdiff=-family Consolas -size 11 -weight normal -slant roman > -underline 0 -overstrike 0 > gui.recentrepo=C:/dev/personal/wp7/NprNews > diff.external=C:/dev/tools/WinMerge/git-diff-wrapper.sh > diff.tool=winmerge > merge.tool=diffmerge > mergetool.diffmerge.cmd=git-merger-wrapper.sh $PWD/$LOCAL $PWD/$BASE > $PWD/$REMOTE $PWD/$MERGED > mergetool.diffmerge.trustexitcode=false > mergetool.diffmerge.keepbackup=false > core.autocrlf=false > difftool.prompt=false > > > On Mon, Aug 22, 2011 at 12:01 PM, Kelly Leahy <[email protected]> > wrote: > > git config --list will give you everything (from all config files). > > > > On Mon, Aug 22, 2011 at 11:58 AM, hammett <[email protected]> wrote: > >> > >> Would that be git config --global -l ? > >> > >> On Mon, Aug 22, 2011 at 11:56 AM, Kelly Leahy <[email protected]> > >> wrote: > >> > It seems like you might have your default merge tool set up to do > diffs > >> > instead of set up as your difftool. I wouldn't recommend doing this > >> > (i.e. > >> > making git diff use winmerge). > >> > > >> > If you want to send me your config file for git I can recommend how > you > >> > should improve it - probably don't want to send it to the whole list, > if > >> > you > >> > want to take this offline. > >> > > >> > Kelly > >> > > >> > On Mon, Aug 22, 2011 at 11:34 AM, hammett <[email protected]> wrote: > >> >> > >> >> Sorry for being such a newbie.. but I'm trying to generate a concise > >> >> diff file with the changes. Running git diff master other/master is > >> >> opening winmerge for every single file, changed or not :-$ > >> >> > >> >> Thanks! > >> >> > >> >> -- > >> >> Cheers, > >> >> hammett > >> >> http://hammett.castleproject.org/ > >> >> > >> >> -- > >> >> You received this message because you are subscribed to the Google > >> >> Groups > >> >> "Castle Project Development List" group. > >> >> To post to this group, send email to > >> >> [email protected]. > >> >> To unsubscribe from this group, send email to > >> >> [email protected]. > >> >> For more options, visit this group at > >> >> http://groups.google.com/group/castle-project-devel?hl=en. > >> >> > >> > > >> > -- > >> > You received this message because you are subscribed to the Google > >> > Groups > >> > "Castle Project Development List" group. > >> > To post to this group, send email to > >> > [email protected]. > >> > To unsubscribe from this group, send email to > >> > [email protected]. > >> > For more options, visit this group at > >> > http://groups.google.com/group/castle-project-devel?hl=en. > >> > > >> > >> > >> > >> -- > >> Cheers, > >> hammett > >> http://hammett.castleproject.org/ > >> > >> -- > >> You received this message because you are subscribed to the Google > Groups > >> "Castle Project Development List" group. > >> To post to this group, send email to > >> [email protected]. > >> To unsubscribe from this group, send email to > >> [email protected]. > >> For more options, visit this group at > >> http://groups.google.com/group/castle-project-devel?hl=en. > >> > > > > -- > > You received this message because you are subscribed to the Google Groups > > "Castle Project Development List" group. > > To post to this group, send email to > [email protected]. > > To unsubscribe from this group, send email to > > [email protected]. > > For more options, visit this group at > > http://groups.google.com/group/castle-project-devel?hl=en. > > > > > > -- > Cheers, > hammett > http://hammett.castleproject.org/ > > -- > You received this message because you are subscribed to the Google Groups > "Castle Project Development List" group. > To post to this group, send email to [email protected] > . > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/castle-project-devel?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Castle Project Development List" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/castle-project-devel?hl=en.
