Mainly a syntax-aware diff that also provides a number of additional tools.
<root>
/
tools
/
gdiff
/
/README.md
| File | Mode | Size |
|---|---|---|
| data/ | 040000 | |
| .gitignore | 100644 | 44B |
| BlankLineAttr.cpp | 100644 | 1,598B |
| BlankLineAttr.hpp | 100644 | 1,595B |
| CodeView.cpp | 100644 | 8,520B |
| CodeView.hpp | 100644 | 2,183B |
| DiffList.cpp | 100644 | 1,995B |
| DiffList.hpp | 100644 | 1,609B |
| FoldTextAttr.cpp | 100644 | 1,977B |
| FoldTextAttr.hpp | 100644 | 1,590B |
| GuiColorScheme.cpp | 100644 | 2,960B |
| GuiColorScheme.hpp | 100644 | 1,176B |
| README.md | 100644 | 1,088B |
| Repository.cpp | 100644 | 7,210B |
| Repository.hpp | 100644 | 2,359B |
| SynHi.cpp | 100644 | 1,337B |
| SynHi.hpp | 100644 | 1,262B |
| ZSDiff.cpp | 100644 | 28KiB |
| ZSDiff.hpp | 100644 | 3,574B |
| gdiff.pro | 100644 | 829B |
| help.html | 100644 | 4,753B |
| main.cpp | 100644 | 3,978B |
| resources.qrc | 100644 | 88B |
| tool.mk | 100644 | 790B |
| zsdiff.ui | 100644 | 7,472B |
/README.md
zograscope :: zs-gdiff
Description
zs-gdiff is a GUI syntax-aware diff that uses Qt5. See description of
zs-diff for more details and comparison against other tools.
The tool can either accept two files on command-line, be integrated with git
by its means (yet using external GUI tools from git isn't very convenient in
general) or pick up list of changed files in the repository (staged or unstaged
in index or from a commit) by itself. The latter way of using zs-gdiff with
git doesn't require any configuration and allows going through files without
restarting it, unlike when git invokes external tools.
Status
There are some issues due to Qt's support for displaying code being in a quite bad state. However, the tool is usable. The issues could be resolved or different GUI toolkit could be used in the future.
Documentation
See the manual page for more details.
Hints
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"
git config --global user.email "your@email_here"
Clone this repository using HTTP(S):
git clone https://code.reversed.top/user/xaizek/zograscope
Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@code.reversed.top/user/xaizek/zograscope
You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a pull request:
... clone the repository ...
... make some changes and some commits ...
git push origin master
... make some changes and some commits ...
git push origin master