See my reply to Roddie above. What shell are you using? On Mar 22, 7:00 pm, Alex Satrapa <[email protected]> wrote: > On 23/03/2010, at 03:27 , Roddie Grant wrote: > > > This is the line straight from the .gitconfig file (it is on one line): > > bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait > > --resume '$1' '$2' fi exit 0 \"" > > If I add semicolons, I avoid the "unexpected end of file" problem, but get no > bbdiff happening :\ > > From my ~/.gitconfig: > > > [alias] > > bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff > > --wait --resume '$1' '$2'; fi; exit 0\"" > > If I restore the GIT_EXTERNAL_DIFF, I get diffs presented through BBEdit. I'm > guessing the alias isn't doing what I expected it would be doing. Such as > nothing actually feeding the parameters in, for example ;) > > I've resorted to using another script (which I guess could be converted to a > shell function): > > > #!/bin/sh > > git status > > GIT_EXTERNAL_DIFF='bbedit-diff-driver' git diff > > so I run that script, it shows me the list of files I'm about to view diffs > for, then off it goes opening up BBEdit. > > Some discussion of similar problems using vimdiff over > athttp://technotales.wordpress.com/2009/05/17/git-diff-with-vimdiff/ > > Hope this helps someone. > Alex
-- You received this message because you are subscribed to the "BBEdit Talk" discussion group on Google Groups. 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/bbedit?hl=en If you have a feature request or would like to report a problem, please email "[email protected]" rather than posting to the group. To unsubscribe from this group, send email to bbedit+unsubscribegooglegroups.com or reply to this email with the words "REMOVE ME" as the subject.
