Praqma / git-merge-driver
Example of how to configure a custom git merge driver
☆104Updated 9 months ago
Related projects ⓘ
Alternatives and complementary repositories for git-merge-driver
- Git command to transform staged files using a formatting command☆192Updated 4 months ago
- Run automated tests against a range of Git commits and keep track of the results☆68Updated 7 months ago
- An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.☆62Updated 3 months ago
- A command line JSON Schema validator that supports many file formats. Fork of jessedc/ajv-cli.☆52Updated 5 years ago
- Fighting the copy-paste element of your rebase workflow.☆248Updated 5 months ago
- TopGit - A different patch queue manager☆67Updated last year
- Language Server Indexing Format (LSIF) generator for JavaScript and TypeScript☆35Updated 2 years ago
- An extension to 'git diff' that provides support for diffing images.☆258Updated 7 months ago
- Bash extension for printing execution time for each command.☆97Updated 2 months ago
- A collection of pre-packaged, Vale-compatible style guides and configurations.☆102Updated 3 months ago
- Test helpers for VSCode textmate grammars☆98Updated 3 months ago
- Giving you a history which is sensitive to the directory you are currently in☆155Updated 4 years ago
- Autoenv for zsh☆165Updated 3 weeks ago
- A powerful testing framework for ZSH projects☆208Updated last year
- Open a local file from a URL at a line number in an editor/IDE☆56Updated last year
- A Visual Studio Code extension for the Vale CLI.☆53Updated last year
- View your xunit results using JavaScript☆192Updated 6 months ago
- Assorted git tools, including git-restore-mtime☆294Updated last month
- Pandoc filter for PlantUML code blocks☆104Updated 3 weeks ago
- TypeScript + Webpack Problem Matchers for VS Code☆44Updated last year
- Determine when a particular commit was merged into a git branch☆432Updated last year
- ☆86Updated 5 months ago
- A tool to verify that your files are in harmony with your .editorconfig☆443Updated this week
- Command-line interface for Ajv JSON Validator☆264Updated 3 months ago
- Bash grammar for tree-sitter☆210Updated 3 weeks ago
- Intelligent string/code manipulation plugin for Jetbrains IDEs: Detects shiftable type of word/line/selection and manipulates it on keybo…☆106Updated 3 years ago
- A handy tool for doing efficient in-memory commit rebases & fixups☆748Updated 6 months ago
- Git utilities☆196Updated 5 months ago
- OnDir is a small program to automate tasks specific to certain directories☆210Updated 11 months ago