paulaltin / git-hires-mergeLinks
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆68Updated 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:
- Visualize performance benchmarks over git commit history☆262Updated last year
- create fixup commits for topic branches☆206Updated last year
- A fast git core.fsmonitor hook written in Rust☆222Updated 9 months ago
- Git command to transform staged files using a formatting command☆219Updated 10 months ago
- Semantic Line Breaks Specification☆100Updated last year
- Open a local file from a URL at a line number in an editor/IDE☆71Updated 2 years ago
- Explode linear sequence of git commits into topic branches☆56Updated last year
- Like grep, but uses tree-sitter grammars to search☆323Updated 3 months ago
- Run automated tests against a range of Git commits and keep track of the results☆78Updated 8 months ago
- Assorted git tools, including git-restore-mtime☆330Updated 3 months ago
- Simple way to edit in a git commit history☆29Updated 3 years ago
- Example of how to configure a custom git merge driver☆109Updated last year
- An extension to 'git diff' that provides support for diffing images.☆285Updated last year
- Filter matching hunks in diffs☆29Updated 2 years ago
- Declarative bash/fish/zsh completions without writing shell scripts☆285Updated 3 weeks ago
- A Rust wc clone☆105Updated 3 years ago
- Stacked branch management for Git☆608Updated 3 weeks ago
- Git subcommand to interactively select changes to commit or stage☆211Updated 6 months ago
- Command line frecency tracking☆149Updated last year
- a subprocess caching utility, available as a command line binary and a Rust library.☆308Updated 5 months ago
- Find build artifacts that are taking up disk space☆340Updated 2 years ago
- ☆93Updated last year
- GitHub Stacked PR with JJ☆16Updated 2 years ago
- This is fork of UHK's firmware featuring extended macro engine.☆80Updated 9 months ago
- Efficiently manage Git branches without leaving your local branch☆54Updated 9 months ago
- Fighting the copy-paste element of your rebase workflow.☆261Updated 10 months ago
- Markdown grammar for tree-sitter☆192Updated 2 years ago
- Your favourite Graphviz editor.☆196Updated this week
- Manage snapshots of your working directory☆20Updated 3 weeks ago
- Print a list of paths as a tree of paths 🌳☆493Updated 4 years ago