paulaltin / git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆64Updated 10 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
Sorting:
- create fixup commits for topic branches☆191Updated 6 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
- Semantic Line Breaks Specification☆87Updated last year
- Explode linear sequence of git commits into topic branches☆53Updated 10 months ago
- Open a local file from a URL at a line number in an editor/IDE☆67Updated last year
- Run automated tests against a range of Git commits and keep track of the results☆69Updated 2 months ago
- Efficiently manage Git branches without leaving your local branch☆53Updated 3 months ago
- Manage snapshots of your working directory☆18Updated this week
- Official git-ps Rust implementation - the future of git-ps☆89Updated 7 months ago
- ☆90Updated last year
- Fish syntax highlighting and formatting☆71Updated last month
- Stacked branch management for Git☆13Updated 2 months ago
- Command line frecency tracking☆137Updated last year
- A zsh histdb fzf integration☆43Updated 3 years ago
- Git command to transform staged files using a formatting command☆208Updated 4 months ago
- Simple way to edit in a git commit history☆29Updated 3 years ago
- A Rust wc clone☆103Updated 2 years ago
- An easy to understand and powerful text search-and-replace tool☆45Updated 3 months ago
- ☆73Updated last year
- Automate the creation of merge proposals for scriptable changes☆45Updated last week
- ea: make your CLI output actionable.☆25Updated last year
- ☆16Updated 4 years ago
- A simple mock-application for programs that work with child processes☆91Updated 2 years ago
- Git command to recommit HEAD with a new set of parents☆71Updated 7 years ago
- A fast git core.fsmonitor hook written in Rust☆213Updated 3 months ago
- git script to automatically create simple fixup commits from currently staged changes☆13Updated 2 years ago
- Set editor options for individual files. Supports Vim and Emacs modelines plus a Code-specific modeline syntax.☆41Updated last year
- Git subcommand to interactively select changes to commit or stage☆203Updated 6 months ago
- Snapshot testing for CLI / REPL applications, in a fun way☆17Updated 2 weeks ago
- stacked diffs in git, seamlessly.☆18Updated last year