paulaltin / git-hires-mergeLinks
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆66Updated last year
Alternatives and similar repositories for git-hires-merge
Users that are interested in git-hires-merge are comparing it to the libraries listed below
Sorting:
- create fixup commits for topic branches☆194Updated 8 months ago
- Visualize performance benchmarks over git commit history☆255Updated last year
- An extension to 'git diff' that provides support for diffing images.☆279Updated last year
- A fast git core.fsmonitor hook written in Rust☆222Updated 6 months ago
- Semantic Line Breaks Specification☆90Updated last year
- Explode linear sequence of git commits into topic branches☆54Updated last year
- Open a local file from a URL at a line number in an editor/IDE☆69Updated 2 years ago
- ☆93Updated last year
- git commit dependency analysis tool☆306Updated last year
- Efficiently manage Git branches without leaving your local branch☆54Updated 6 months ago
- Automatically trims your branches whose tracking remote refs are merged or stray☆517Updated 4 months ago
- Like grep, but uses tree-sitter grammars to search☆320Updated this week
- Assorted git tools, including git-restore-mtime☆321Updated 10 months ago
- Bash grammar for tree-sitter☆248Updated 2 months ago
- Simple way to edit in a git commit history☆29Updated 3 years ago
- Stacked branch management for Git☆576Updated last week
- Fighting the copy-paste element of your rebase workflow.☆258Updated 7 months ago
- Stacked Git☆597Updated last week
- Git subcommand to interactively select changes to commit or stage☆207Updated 2 months ago
- Example of how to configure a custom git merge driver☆108Updated last year
- Markdown grammar for tree-sitter☆188Updated 2 years ago
- Set editor options for individual files. Supports Vim and Emacs modelines plus a Code-specific modeline syntax.☆42Updated last year
- Print a list of paths as a tree of paths 🌳☆489Updated 3 years ago
- Test driver for command line tools☆33Updated 2 months ago
- Stacked diff support for GitHub workflows☆164Updated 2 months ago
- ☆74Updated 2 years ago
- Linter for Zshell scripting language☆140Updated 2 years ago
- Filter matching hunks in diffs☆29Updated 2 years ago
- Command line frecency tracking☆140Updated last year
- Simple, fast & configurable tool to open and preview files☆23Updated 2 months ago