paulaltin / git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆62Updated 3 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
- Semantic Line Breaks Specification☆75Updated 8 months ago
- Visualize performance benchmarks over git commit history☆243Updated 9 months ago
- create fixup commits for topic branches☆187Updated 10 months ago
- ea: make your CLI output actionable.☆23Updated last year
- Open a local file from a URL at a line number in an editor/IDE☆56Updated last year
- A Rust wc clone☆103Updated 2 years ago
- ☆86Updated 5 months ago
- A pager written in Rust, like more or less.☆52Updated 5 years ago
- ☆69Updated last year
- Efficiently manage Git branches without leaving your local branch☆53Updated 9 months ago
- A handy tool for doing efficient in-memory commit rebases & fixups☆748Updated 6 months ago
- Git command to transform staged files using a formatting command☆192Updated 4 months ago
- Keep track of all your git repositories.☆25Updated last week
- Manage snapshots of your working directory☆17Updated last week
- A helper for quickly opening matches in vim☆23Updated last year
- CLI utility to find the union, intersection, set difference, etc of files considered as sets of lines☆192Updated 8 months ago
- A tool to help manage context/project specific shell-things like environment variables.☆46Updated last year
- Automate the creation of merge proposals for scriptable changes☆40Updated this week
- Command line frecency tracking☆123Updated 10 months ago
- Tools for chezmoi to handle mixed settings and state☆45Updated this week
- Simple way to edit in a git commit history☆29Updated 2 years ago
- Declarative bash/fish/zsh completions without writing shell scripts☆221Updated last month
- Run automated tests against a range of Git commits and keep track of the results☆68Updated 7 months ago
- A simple mock-application for programs that work with child processes☆90Updated 2 years ago
- Autocompletion for python scripts in zsh☆23Updated last year
- A CLI utility, Rust crate, Lua Rock, Python module, JavaScript module, Neovim plugin, and SILE package to cast strings to title-case acco…☆16Updated this week
- Z shell debugger extension for VSCode (based on vscode-bash-debug + zshdb)☆19Updated last year
- Bash grammar for tree-sitter☆210Updated 3 weeks ago