paulaltin / git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆62Updated 4 months ago
Related projects ⓘ
Alternatives and complementary repositories for git-hires-merge
- Explode linear sequence of git commits into topic branches☆53Updated 4 months ago
- Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch.☆52Updated 2 years ago
- ☆86Updated 6 months ago
- create fixup commits for topic branches☆187Updated last week
- Semantic Line Breaks Specification☆75Updated 9 months ago
- Like grep, but uses tree-sitter grammars to search☆298Updated this week
- Open a local file from a URL at a line number in an editor/IDE☆56Updated last year
- Command line frecency tracking☆123Updated 10 months ago
- Efficiently manage Git branches without leaving your local branch☆53Updated 9 months ago
- Manage snapshots of your working directory☆17Updated 2 weeks ago
- ☆69Updated last year
- A simple mock-application for programs that work with child processes☆90Updated 2 years ago
- Run automated tests against a range of Git commits and keep track of the results☆68Updated 8 months ago
- Automate the creation of merge proposals for scriptable changes☆41Updated this week
- Command-line regular expression tester☆30Updated last year
- Less - text pager☆10Updated 3 years ago
- Bash grammar for tree-sitter☆211Updated last week
- Visualize performance benchmarks over git commit history☆245Updated 10 months ago
- A handy tool for doing efficient in-memory commit rebases & fixups☆748Updated 7 months ago
- A pager written in Rust, like more or less.☆52Updated 5 years ago
- A Rust wc clone☆103Updated 2 years ago
- Example of how to configure a custom git merge driver☆104Updated 9 months ago
- A zsh histdb fzf integration☆43Updated 2 years ago
- Access the system clipboard from anywhere using the ANSI OSC52 sequence☆69Updated this week
- ea: make your CLI output actionable.☆23Updated last year
- Git command to transform staged files using a formatting command☆193Updated 5 months ago
- A Visual Studio Code plugin for working with Just.☆26Updated 2 years ago
- A fast git core.fsmonitor hook written in Rust☆204Updated 2 years ago
- Simple, fast & configurable tool to open and preview files☆22Updated last week
- An easy to understand and powerful text search-and-replace tool☆45Updated 8 months ago