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
- Semantic Line Breaks Specification☆101Updated last year
- A handy tool for doing efficient in-memory commit rebases & fixups☆811Updated 3 weeks ago
- create fixup commits for topic branches☆207Updated last year
- A fast git core.fsmonitor hook written in Rust☆224Updated 10 months ago
- Explode linear sequence of git commits into topic branches☆56Updated last year
- Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch.☆55Updated 3 years ago
- Git command to transform staged files using a formatting command☆221Updated 11 months ago
- Open a local file from a URL at a line number in an editor/IDE☆72Updated 2 years ago
- An extension to 'git diff' that provides support for diffing images.☆287Updated last year
- Run automated tests against a range of Git commits and keep track of the results☆79Updated 9 months ago
- Markdown grammar for tree-sitter☆192Updated 2 years ago
- Simple way to edit in a git commit history☆29Updated 3 years ago
- Command line frecency tracking☆150Updated last year
- Automatically trims your branches whose tracking remote refs are merged or stray☆527Updated 8 months ago
- Declarative bash/fish/zsh completions without writing shell scripts☆284Updated last month
- Example of how to configure a custom git merge driver☆109Updated last year
- Yet another diff highlighting tool☆603Updated last year
- Git subcommand to interactively select changes to commit or stage☆212Updated 7 months ago
- Like grep, but uses tree-sitter grammars to search☆323Updated 4 months ago
- Stacked Git☆633Updated last month
- A Rust wc clone☆105Updated 3 years ago
- Test driver for command line tools☆33Updated last month
- cha(rs) is a commandline tool to display information about unicode characters☆187Updated last week
- Manage PR stacks/chains on Github☆154Updated 4 years ago
- A script allowing moving changes of particular files from one commit to another☆103Updated 6 years ago
- Stacked diff support for GitHub workflows☆169Updated 3 weeks ago
- Manage snapshots of your working directory☆20Updated 2 weeks ago
- Official git-ps Rust implementation - the future of git-ps☆100Updated last year
- Print a list of paths as a tree of paths 🌳☆493Updated 4 years ago