paulaltin / git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆63Updated 8 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
- ☆90Updated 10 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
- Open a local file from a URL at a line number in an editor/IDE☆65Updated last year
- Semantic Line Breaks Specification☆87Updated last year
- Command line frecency tracking☆136Updated last year
- Explode linear sequence of git commits into topic branches☆52Updated 8 months ago
- Efficiently manage Git branches without leaving your local branch☆53Updated last month
- A language server for GNU Make, supporting context-aware autocompletion for implicit and automatic variables.☆13Updated 2 years ago
- Git command to recommit HEAD with a new set of parents☆70Updated 7 years ago
- Run automated tests against a range of Git commits and keep track of the results☆69Updated 2 weeks ago
- create fixup commits for topic branches☆190Updated 4 months ago
- Command-line regular expression tester☆31Updated 2 years ago
- ea: make your CLI output actionable.☆25Updated last year
- A zsh histdb fzf integration☆43Updated 3 years ago
- Manage snapshots of your working directory☆17Updated 3 weeks ago
- Filter matching hunks in diffs☆28Updated 2 years ago
- Stacked branch management for Git☆11Updated last month
- Linter for Zshell scripting language☆131Updated last year
- Dive into a file's history to find root cause☆63Updated 3 weeks ago
- Set editor options for individual files. Supports Vim and Emacs modelines plus a Code-specific modeline syntax.☆41Updated last year
- ☆72Updated last year
- GitHub Stacked PR with JJ☆10Updated last year
- Tools for chezmoi to handle mixed settings and state☆52Updated last week
- stacked diffs in git, seamlessly.☆18Updated last year
- An in-place file rewrite utility, useful for redirecting output to same file as source.☆26Updated 4 years ago
- A simple mock-application for programs that work with child processes☆90Updated 2 years ago
- Official git-ps Rust implementation - the future of git-ps☆88Updated 5 months ago
- Simplified version of GNU find using the PCRE library for regex.☆22Updated 5 years ago
- Test driver for command line tools☆31Updated 2 months ago
- POSIX shell scripts to figure out if a terminal has a dark or light background☆36Updated 2 months ago