Praqma / git-merge-driverLinks
Example of how to configure a custom git merge driver
☆108Updated last year
Alternatives and similar repositories for git-merge-driver
Users that are interested in git-merge-driver are comparing it to the libraries listed below
Sorting:
- A command line JSON Schema validator that supports many file formats. Fork of jessedc/ajv-cli.☆53Updated 5 years ago
- An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.☆64Updated 10 months ago
- A JS refactoring and code automation tool for building better source☆27Updated 3 years ago
- Fighting the copy-paste element of your rebase workflow.☆257Updated 5 months ago
- A powerful testing framework for ZSH projects☆216Updated last year
- Run automated tests against a range of Git commits and keep track of the results☆70Updated 2 months ago
- Test helpers for VSCode textmate grammars☆105Updated 4 months ago
- Mocking/stubbing library for BATS (Bash Automated Testing System)☆90Updated 7 months ago
- Some useful helpers for common direnv.net project layouts including NVM, Meteor, BigCommerce (stencil)☆54Updated 3 years ago
- Convert from JIRA text formatting to GitHub Flavored MarkDown and back again☆66Updated last year
- 💾 🧮 🤯 Parse the 'git log' of multiple repos to 'JSON'☆134Updated last year
- Open a local file from a URL at a line number in an editor/IDE☆68Updated last year
- Pandoc filter for PlantUML code blocks☆110Updated 7 months ago
- Git command to transform staged files using a formatting command☆211Updated 5 months ago
- Command-line interface for Ajv JSON Validator☆285Updated 10 months ago
- A Jira Command Line Interface☆67Updated 2 years ago
- XSD for Apache Ant's JUnit output☆98Updated 2 years ago
- Explode linear sequence of git commits into topic branches☆53Updated 11 months ago
- git commit dependency analysis tool☆301Updated 10 months ago
- Interactive Language Server log inspector☆169Updated 4 years ago
- Run your tests headlessly ❌🖥️☆145Updated 3 weeks ago
- A command line client covering 100% of GitHub's restful APIs.☆63Updated 4 years ago
- A git command to play back file history.☆133Updated 5 years ago
- The GitHub CODEOWNERS file validator☆232Updated last year
- A git merge driver that use xdiff to automatically resolve merge conflicts in json files. This project was inspired by git-po-merge.☆115Updated last year
- ☆25Updated 2 years ago
- stacked diffs in git, seamlessly.☆18Updated last year
- ☆30Updated last year
- View your xunit results using JavaScript☆202Updated last year
- An extension to 'git diff' that provides support for diffing images.☆272Updated last year