paulaltin / git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆63Updated 7 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
- Open a local file from a URL at a line number in an editor/IDE☆63Updated last year
- Semantic Line Breaks Specification☆84Updated last year
- A Visual Studio Code plugin for working with Just.☆16Updated 2 years ago
- Efficiently manage Git branches without leaving your local branch☆53Updated last week
- A language server for GNU Make, supporting context-aware autocompletion for implicit and automatic variables.☆13Updated 2 years ago
- Run automated tests against a range of Git commits and keep track of the results☆68Updated last month
- ea: make your CLI output actionable.☆25Updated last year
- create fixup commits for topic branches☆188Updated 3 months ago
- Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch.☆54Updated 2 years ago
- ☆88Updated 9 months ago
- Git command to transform staged files using a formatting command☆199Updated last month
- Linter for Zshell scripting language☆129Updated last year
- Explode linear sequence of git commits into topic branches☆52Updated 7 months ago
- Visualize performance benchmarks over git commit history☆248Updated last year
- A Rust wc clone☆103Updated 2 years ago
- Tools for chezmoi to handle mixed settings and state☆51Updated this week
- A fast git core.fsmonitor hook written in Rust☆208Updated 2 weeks ago
- Manage snapshots of your working directory☆17Updated last week
- ☆70Updated last year
- Declarative bash/fish/zsh completions without writing shell scripts☆247Updated last month
- Imports a `.zsh_history` file into a https://github.com/larkery/zsh-histdb sqlite database.☆25Updated 11 months ago
- A zsh histdb fzf integration☆43Updated 2 years ago
- Access the system clipboard from anywhere using the ANSI OSC52 sequence☆87Updated 2 months ago
- stacked diffs in git, seamlessly.☆18Updated 10 months ago
- Fnug runs all your lints, tests and commands at once, in the terminal. With git integration and file watching☆31Updated 2 months ago
- Git command to recommit HEAD with a new set of parents☆70Updated 7 years ago
- Rebase many branches at once, useful for updating topic branches against upstream☆52Updated 8 years ago
- Filter matching hunks in diffs☆28Updated 2 years ago
- visualize tree-sitter syntax tree☆23Updated 3 years ago
- An easy to understand and powerful text search-and-replace tool☆45Updated 3 weeks ago