A file conflict viewer for git
Project description
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
- AI intergrated
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
Project details
Release history Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.
Source Distributions
No source distribution files available for this release.See tutorial on generating distribution archives.
Built Distribution
qgitc-4.1.0-py3-none-any.whl
(147.5 kB
view details)
File details
Details for the file qgitc-4.1.0-py3-none-any.whl
.
File metadata
- Download URL: qgitc-4.1.0-py3-none-any.whl
- Upload date:
- Size: 147.5 kB
- Tags: Python 3
- Uploaded using Trusted Publishing? Yes
- Uploaded via: twine/5.1.1 CPython/3.12.7
File hashes
Algorithm | Hash digest | |
---|---|---|
SHA256 | 641ca93b253f0d3fd9d2223b56bb0802a5cf8ce83b1014e1565eaca7d4d69c50 |
|
MD5 | 2d3e1aa341248ec2741a087aed074b84 |
|
BLAKE2b-256 | 4f01fce8f7960531e4221761dca608fedb1e6572d73297616d365806407a2f5e |