qgitc 3.3.1

A file conflict viewer for git

QGitc

A file conflict viewer for git

Features

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

Requirements

• PySide2 >= 5.2.0
• 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