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
- Semantic Line Breaks Specification☆84Updated 11 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
- create fixup commits for topic branches☆188Updated 3 months ago
- Explode linear sequence of git commits into topic branches☆52Updated 7 months ago
- Run automated tests against a range of Git commits and keep track of the results☆68Updated last month
- Efficiently manage Git branches without leaving your local branch☆53Updated last week
- ☆88Updated 9 months ago
- A handy tool for doing efficient in-memory commit rebases & fixups☆755Updated 3 weeks ago
- Snapshot testing for CLI / REPL applications, in a fun way☆14Updated this week
- A REPL-style development environment for small C++ snippets☆51Updated 5 months ago
- a subprocess caching utility, available as a command line binary and a Rust library.☆262Updated 2 weeks ago
- Open a local file from a URL at a line number in an editor/IDE☆63Updated last year
- A Rust wc clone☆103Updated 2 years ago
- Automate the creation of merge proposals for scriptable changes☆44Updated this week
- Declarative bash/fish/zsh completions without writing shell scripts☆247Updated last month
- Command line frecency tracking☆131Updated last year
- ea: make your CLI output actionable.☆24Updated last year
- Git command to transform staged files using a formatting command☆199Updated last month
- Set editor options for individual files. Supports Vim and Emacs modelines plus a Code-specific modeline syntax.☆41Updated last year
- Command line interface to convert strings into any case.☆25Updated last year
- Count your code by tokens and patterns in the syntax tree. A tokei/scc/cloc alternative.☆69Updated last year
- Fish syntax highlighting and formatting☆70Updated last year
- An in-place file rewrite utility, useful for redirecting output to same file as source.☆26Updated 3 years ago
- Linter for Zshell scripting language☆129Updated last year
- An easy to understand and powerful text search-and-replace tool☆45Updated 3 weeks ago
- Manage snapshots of your working directory☆17Updated last week
- Imports a `.zsh_history` file into a https://github.com/larkery/zsh-histdb sqlite database.☆25Updated 11 months ago
- ☆77Updated 7 years ago
- Example of how to configure a custom git merge driver☆107Updated last year
- Efficiently compute the differences between two directories☆91Updated 2 years ago