Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add git support #5

Open
fxkr opened this issue Sep 25, 2014 · 3 comments
Open

Add git support #5

fxkr opened this issue Sep 25, 2014 · 3 comments

Comments

@fxkr
Copy link
Owner

fxkr commented Sep 25, 2014

Right now, diffing two git versions of the same file is really cumbersome (git show $rev1:./foo.brd > old.brd ; git show $rev2:./foo.brd > new.brd ; eagle-diff old.brd new.brd).

@karlp
Copy link
Contributor

karlp commented Oct 20, 2015

Should be just a matter of telling git how to use diff right? like done here: https://github.com/jotux/eagle-diff/blob/master/readme.md#add-this-to-your-gitconfig

@fxkr
Copy link
Owner Author

fxkr commented Oct 20, 2015

Nice, I didn't know about that.

I guess it'd have to create a temporary directory somewhere, put the images there, display the images somehow (I don't think there's a good portable way to display multiple images), and remove the directory when whatever image viewer was used exits.

@karlp
Copy link
Contributor

karlp commented Oct 20, 2015

so, what I've got working is...

in ~/.gitconfig

[difftool "eagle"]
    cmd = eagle-diff -f -d 100 --eagle /home/karlp/tools/eagle-tastic/bin/eagle $LOCAL $REMOTE

then

git difftool -t eagle rev1 rev2 filename.{brd,sch}

That works. It's not as nice as straight git diff. Using the .gitattributes from the other repo works, but we'd need to make a wrapper script that takes a fixed set of 7 parameters. I couldn't work out a neat way around that.

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

No branches or pull requests

2 participants