Skip to main content

A file conflict viewer for git

Project description

QGitc

PyPI version Python version License

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

Project details


Release history Release notifications

Download files

Download the file for your platform. If you're not sure which to choose, learn more about installing packages.

Files for qgitc, version 2.0.0
Filename, size File type Python version Upload date Hashes
Filename, size qgitc-2.0.0-py3-none-any.whl (84.8 kB) File type Wheel Python version py3 Upload date Hashes View

Supported by

Pingdom Pingdom Monitoring Google Google Object Storage and Download Analytics Sentry Sentry Error logging AWS AWS Cloud computing DataDog DataDog Monitoring Fastly Fastly CDN DigiCert DigiCert EV certificate StatusPage StatusPage Status page