Skip to content

Latest commit

 

History

History
76 lines (47 loc) · 2.83 KB

README.md

File metadata and controls

76 lines (47 loc) · 2.83 KB
Raw

Quit Diff

Requirements

For using QuitDiff you need to have python version 3 installed.

To install the required packages use pip:

pip install -r requirements.txt

Use as git-difftool

Add one of the following sections to you ~/.gitconfig (in your home directory) or .git/config (in your git working directory).

[difftool "quitdiff"]
    cmd = quitdiff.py --local=\"$LOCAL\" --remote=\"$REMOTE\" --merged=\"$MERGES\" --base=\"$BASE\"


[difftool "quitdiff-sparql"]
    cmd = quitdiff.py --diffFormat sparql --local=\"$LOCAL\" --remote=\"$REMOTE\" --merged=\"$MERGES\" --base=\"$BASE\"

[difftool "quitdiff-eccrev"]
    cmd = quitdiff.py --diffFormat eccrev --local=\"$LOCAL\" --remote=\"$REMOTE\" --merged=\"$MERGES\" --base=\"$BASE\"

The git diff tool can then called with one of the following commands

$ git difftool -t quitdiff
$ git difftool -t quitdiff HEAD~0..HEAD~2

Use as git-diff

Add the following sections to you ~/.gitconfig (in your home directory) or .git/config (in your git working directory).

[diff "quitdiff"]
    command = quitdiff.py

and the following to .gitattributes (in your git working directory).

*.nq diff=quitdiff
*.trig diff=quitdiff
*.nt diff=quitdiff
*.ttl diff=quitdiff
*.rdf diff=quitdiff

git diff can then called with one of the following commands

$ git diff
$ git diff HEAD~0..HEAD~2

Command line parameters

This tool can be used for git-diff or as git-difftool

git-diff:

if using as git-diff, the parameters are: path old-file old-hex old-mode new-file new-hex new-mode

git-difftool:

https://git-scm.com/docs/git-difftool

  • $LOCAL is set to the name of the temporary file containing the contents of the diff pre-image and

  • $REMOTE is set to the name of the temporary file containing the contents of the diff post-image.

  • $MERGED is the name of the file which is being compared.

  • $BASE is provided for compatibility with custom merge tool commands and has the same value as $MERGED.

  • local is the old version

  • remote is the new version

License

Copyright (C) 2017 Natanael Arndt http://aksw.org/NatanaelArndt and Norman Radtke http://aksw.org/NormanRadtke

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

You should have received a copy of the GNU General Public License along with this program; if not, see http://www.gnu.org/licenses. Please see LICENSE for further information.