Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/magit/magit-imerge
Magit extension for git-imerge
https://github.com/magit/magit-imerge
emacs magit merge-conflicts
Last synced: about 1 month ago
JSON representation
Magit extension for git-imerge
- Host: GitHub
- URL: https://github.com/magit/magit-imerge
- Owner: magit
- Created: 2017-07-15T18:54:46.000Z (over 7 years ago)
- Default Branch: master
- Last Pushed: 2024-08-11T19:33:44.000Z (5 months ago)
- Last Synced: 2024-08-11T20:27:01.999Z (5 months ago)
- Topics: emacs, magit, merge-conflicts
- Language: Emacs Lisp
- Homepage:
- Size: 78.1 KB
- Stars: 31
- Watchers: 4
- Forks: 4
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
[![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt)
[![MELPA](https://melpa.org/packages/magit-imerge-badge.svg)](https://melpa.org/#/magit-imerge)Magit-imerge is a Magit interface to git-imerge, a Git extension for
performing incremental merges. See git-imerge's [homepage] for more
information about git-imerge. The [commentary] in magit-imerge.el
provides an overview of Magit-imerge commands.[badge-license]: https://img.shields.io/badge/license-GPL_3-green.svg
[homepage]: https://github.com/mhagger/git-imerge
[commentary]: https://github.com/magit/magit-imerge/blob/master/magit-imerge.el#L24