Description:

qgitc 4.0.0

QGitc




A file conflict viewer for git
Features

Two branches view for easy comparing a conflict commit base on the file.
Visualize white spaces and carriage return for easy diff compare.
Syntax highlight for diff contents.
Filter logs by file path or commit pattern.
Copy commit summary as HTML format for pasting.
Custom pattern for creating links.
Collect conflict files for merging.
Launch specify merge tool for specify file suffix.
Builtin image diff tool for easy finding the difference.
Auto finding which commit cause conflicts.
File blame support

Requirements

PySide6
git (command line)
chardet
pywin32

Optional for Windows if you want record the conflict log easily


pywpsrpc

Optional for Linux if you want record the conflict log easily


openpyxl

Optional if no pywin32/ pywpsrpc is available



Build & Run


Using source directly

Run qgitc.py under project root directory.
NOTE: If you want translation other than English or updated the UI files, run python setup.py build for the first time.



Build from source

Run pip install . under project root directory to install qgitc, and then run qgitc command.



Install from pypi

pip install qgitc



Shell Integration
qgitc shell register
# to unregister, run:
qgitc shell unregister

# to use the source directly:
python qgitc.py shell register

# for Linux user
# if your file manager isn't the default one comes with desktop
# say your desktop is Ubuntu, but use thunar as default one
# use --file-manager to specify reigster for
qgitch shell register --file-manager=thunar

License

For personal and professional use. You cannot resell or redistribute these repositories in their original state.

Share

• Share on Facebook
• Share on Twitter