paulaltin / git-hires-mergeLinks
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☆192Updated 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
- A handy tool for doing efficient in-memory commit rebases & fixups☆776Updated 3 weeks ago
- A fast git core.fsmonitor hook written in Rust☆216Updated 4 months ago
- Run automated tests against a range of Git commits and keep track of the results☆70Updated 2 months ago
- Open a local file from a URL at a line number in an editor/IDE☆68Updated last year
- Efficiently manage Git branches without leaving your local branch☆53Updated 3 months ago
- Manage snapshots of your working directory☆18Updated this week
- ☆91Updated last year
- Semantic Line Breaks Specification☆87Updated last year
- Official git-ps Rust implementation - the future of git-ps☆92Updated 7 months ago
- Tools for chezmoi to handle mixed settings and state☆56Updated this week
- Git command to recommit HEAD with a new set of parents☆71Updated 7 years ago
- Explode linear sequence of git commits into topic branches☆53Updated 11 months ago
- GitHub Stacked PR with JJ☆12Updated last year
- Example of how to configure a custom git merge driver☆108Updated last year
- A language server for GNU Make, supporting context-aware autocompletion for implicit and automatic variables.☆16Updated 2 years ago
- Fnug runs all your lints, tests and commands at once, in the terminal. With git integration and file watching☆32Updated 6 months ago
- Filter matching hunks in diffs☆28Updated 2 years ago
- Automatically trims your branches whose tracking remote refs are merged or stray☆509Updated last month
- Visualize performance benchmarks over git commit history☆251Updated last year
- Command line frecency tracking☆137Updated last year
- Simple, fast & configurable tool to open and preview files☆23Updated last month
- ea: make your CLI output actionable.☆25Updated last year
- Generate bash/zsh completions from man pages☆88Updated last year
- a subprocess caching utility, available as a command line binary and a Rust library.☆281Updated 2 months ago
- An experimental proofreading and linting language server for markdown files ✍️☆175Updated 2 years ago
- A framework for adding lint checks to Bazel projects☆146Updated 9 months ago
- Linter for Zshell scripting language☆135Updated last year
- A git tool to manage worktrees and integrate with GitHub and GitLab☆83Updated 4 months ago