paulaltin / git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆64Updated 9 months ago
Alternatives and similar repositories for git-hires-merge:
Users that are interested in git-hires-merge are comparing it to the libraries listed below
- Semantic Line Breaks Specification☆87Updated last year
- create fixup commits for topic branches☆189Updated 5 months ago
- A handy tool for doing efficient in-memory commit rebases & fixups☆768Updated 2 months ago
- Efficiently manage Git branches without leaving your local branch☆53Updated 2 months ago
- Explode linear sequence of git commits into topic branches☆52Updated 9 months ago
- Open a local file from a URL at a line number in an editor/IDE☆65Updated last year
- ☆72Updated last year
- Run automated tests against a range of Git commits and keep track of the results☆69Updated last month
- Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch.☆54Updated 2 years ago
- Dive into a file's history to find root cause☆63Updated last week
- Manage snapshots of your working directory☆17Updated last week
- ☆90Updated 11 months ago
- Official git-ps Rust implementation - the future of git-ps☆90Updated 6 months ago
- Command line frecency tracking☆137Updated last year
- Powershell utilities for working with fzf☆10Updated last year
- Test driver for command line tools☆31Updated 3 months ago
- A fast git core.fsmonitor hook written in Rust☆212Updated 2 months ago
- Filter matching hunks in diffs☆28Updated 2 years ago
- Visualize performance benchmarks over git commit history☆250Updated last year
- A pager written in Rust, like more or less.☆54Updated 6 years ago
- A zsh histdb fzf integration☆43Updated 3 years ago
- ea: make your CLI output actionable.☆25Updated last year
- Snapshot testing for CLI / REPL applications, in a fun way☆16Updated 3 weeks ago
- lazy loading for shell completion scripts☆23Updated 2 years ago
- GitHub Stacked PR with JJ☆10Updated last year
- A REPL-style development environment for small C++ snippets☆53Updated 7 months ago
- Global Regular Expression Tree☆65Updated last year
- Jump to a position in a command line☆11Updated 8 years ago
- A Rust wc clone☆103Updated 2 years ago
- An easy to understand and powerful text search-and-replace tool☆45Updated 2 months ago