Praqma / git-merge-driver
Example of how to configure a custom git merge driver
☆107Updated 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
- Jira Hot Linker☆40Updated 5 months ago
- A command line JSON Schema validator that supports many file formats. Fork of jessedc/ajv-cli.☆53Updated 5 years ago
- Additions and tweaks to the Git CLI.☆23Updated this week
- Run automated tests against a range of Git commits and keep track of the results☆68Updated last month
- Imports a `.zsh_history` file into a https://github.com/larkery/zsh-histdb sqlite database.☆25Updated 11 months ago
- Some useful helpers for common direnv.net project layouts including NVM, Meteor, BigCommerce (stencil)☆53Updated 2 years ago
- VSCode extension providing Github Actions YAML support.☆57Updated 2 years ago
- An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.☆63Updated 7 months ago
- Fighting the copy-paste element of your rebase workflow.☆252Updated last month
- Generate Homebrew formulae for npm packages☆40Updated last year
- A command line client covering 100% of GitHub's restful APIs.☆63Updated 4 years ago
- Bash completion for Yarn☆278Updated 8 months ago
- Git subcommand to interactively select changes to commit or stage☆200Updated 3 months ago
- Git plugin that allows you to save multiple user profiles and set them as project defaults☆47Updated 2 years ago
- Visual Code Studio jq playground☆46Updated this week
- Cursor position history manager☆59Updated 5 years ago
- Version aliases for asdf-vm☆28Updated 2 years ago
- SQL syntax highlighting for tree-sitter☆114Updated 11 months ago
- An IntelliJ plugin that wraps text☆63Updated 5 months ago
- ☆88Updated 9 months ago
- Promote writing Zsh software not simple scripts☆22Updated last year
- OnDir is a small program to automate tasks specific to certain directories☆209Updated last year
- Vim's quickfix errorformat implementation in Go☆110Updated last month
- GitHub Action to install packages from brew, brew cask, apt and choco.☆26Updated last year
- Language Server Indexing Format (LSIF) generator for JavaScript and TypeScript☆36Updated 2 years ago
- Autoenv for zsh☆168Updated last month
- JSON Fixer for Humans using (relaxed) JSON5☆131Updated 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.☆112Updated 11 months ago
- Explode linear sequence of git commits into topic branches☆52Updated 7 months ago
- tail cypress test on console error☆41Updated 2 weeks ago