xaizek / zograscope (License: AGPLv3 only) (since 2018-12-07)
Mainly a syntax-aware diff that also provides a number of additional tools.
<root> / tools / gdiff / tool.mk (ac75862cc084c11a567bcdb0e8c960ec128159b8) (790B) (mode 100644) [raw]
ifeq ($(QT5_PROG),)
    tools := $(filter-out gdiff,$(tools))
endif
ifeq ($(HAVE_LIBGIT2),)
    tools := $(filter-out gdiff,$(tools))
endif

gdiff.abs_out := $(abspath $(out_dir))/tools/gdiff

gdiff.extradeps := $(addprefix tools/gdiff/, gdiff.pro help.html resources.qrc)
gdiff.extradeps += $(wildcard $(addprefix tools/gdiff/, *.ui *.hpp))

gdiff.qmake_args := OUT="$(abspath $(out_dir))" QMAKE_LFLAGS+="$(EXTRA_LDFLAGS)"
ifeq ($(is_release),0)
    gdiff.qmake_args += CONFIG+=debug
endif

$(out_dir)/zs-gdiff:
	@cd $(gdiff.abs_out)/ && \
	    $(QT5_PROG) $(gdiff.qmake_args) $(abspath .)/tools/gdiff/gdiff.pro
	+@$(MAKE) -C $(gdiff.abs_out)/
	@mv $(gdiff.abs_out)/zs-gdiff $(out_dir)/zs-gdiff

clean: gdiff.clean

gdiff.clean:
	-@make -C $(gdiff.abs_out)/ distclean

.PHONY: gdiff.clean
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"

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