qgitc 2.0.0

A file conflict viewer for git

QGitc

A file conflict viewer for git

Features

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

Requirements

• PySide2

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