paulaltin / git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆62Updated 6 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
- Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch.☆54Updated 2 years ago
- Visualize performance benchmarks over git commit history☆245Updated last year
- create fixup commits for topic branches☆188Updated 2 months ago
- Open a local file from a URL at a line number in an editor/IDE☆61Updated last year
- ea: make your CLI output actionable.☆23Updated last year
- ☆87Updated 8 months ago
- Explode linear sequence of git commits into topic branches☆52Updated 6 months ago
- Run automated tests against a range of Git commits and keep track of the results☆68Updated 2 weeks ago
- Semantic Line Breaks Specification☆83Updated 11 months ago
- Efficiently manage Git branches without leaving your local branch☆53Updated last month
- A zsh histdb fzf integration☆43Updated 2 years ago
- Command line interface to convert strings into any case.☆25Updated last year
- Provides the functionality of GNU Stow in a cross platform CLI tool and python module☆81Updated 6 months ago
- A helper for quickly opening matches in vim☆24Updated last month
- Test driver for command line tools☆30Updated 2 weeks ago
- Set editor options for individual files. Supports Vim and Emacs modelines plus a Code-specific modeline syntax.☆41Updated 11 months ago
- A handy tool for doing efficient in-memory commit rebases & fixups☆752Updated 9 months ago
- Example of how to configure a custom git merge driver☆105Updated 11 months ago
- Tools for chezmoi to handle mixed settings and state☆49Updated last week
- Like grep, but uses tree-sitter grammars to search☆305Updated this week
- Linter for Zshell scripting language☆128Updated last year
- nixpkgs development utility☆21Updated 5 years ago
- Command-line regular expression tester☆31Updated last year
- Filter matching hunks in diffs☆28Updated 2 years ago
- A fast git core.fsmonitor hook written in Rust☆206Updated 2 years ago
- ☆70Updated last year
- Declarative bash/fish/zsh completions without writing shell scripts☆242Updated 3 weeks ago
- Less - text pager☆9Updated 4 years ago
- Git subcommand to interactively select changes to commit or stage☆198Updated 2 months ago