GitHub - idanarye/vim-merginal: Fugitive extension to manage and merge Git branc...

7 years ago

source link: https://github.com/idanarye/vim-merginal
Go to the source link to view the article. You can view the picture content, updated content and better typesetting reading experience. If the link is broken, please click the button below to view the snapshot at that time.

INTRODUCTION

Merginal aims to provide a nice interface for dealing with Git branches. It offers interactive TUI for:

Viewing the list of branches
Checking out branches from that list
Creating new branches
Deleting branches
Merging branches
Rebasing branches
Solving merge conflicts
Interacting with remotes(pulling, pushing, fetching, tracking)
Diffing against other branches
Renaming branches
Viewing git history for branches

REQUIREMENTS

Merginal is based on Fugitive, so it requires Fugitive. If you don't have it already you can get it from https://github.com/tpope/vim-fugitive

It should go without saying that you need Git.

Under Windows, vimproc is an optional requirement. Merginal will work without it, but it'll pop an ugly console window every time it needs to run a Git command. You can get vimproc from https://github.com/Shougo/vimproc.vim

USAGE

To use Merginal you need to know but one command: :Merginal. It'll open the branch list buffer, unless the repository is in merge mode then it'll open the merge conflicts buffer.

Like Fugitive's commands, :Merginal is native to the buffer, and will only work in buffers that are parts of Git repositories.

You can also toggle the buffer with :MerginalToggle or close it with :MerginalClose.

To see a list of keymaps available in each Merginal buffer, press ?.

</article

Recommend

161

Github github.com 7 years ago
Cache

GitHub - idanarye/vim-vebugger: Yes, we do need another debugger plugin

README.md INTRODUCTION Screencast - https://vimeo.com/95775461 Vebugger is yet another...

139

Github github.com 7 years ago
Cache

GitHub - tpope/vim-fugitive: fugitive.vim: a Git wrapper so awesome, it should b...

fugitive.vim Fugitive is the premier Vim plugin for Git. Or maybe it's the premier Git plugin for Vim? Either way, it's "so awesome, it should be illegal". That's why it's called Fugitive. The crown jewel of Fugitive is :G...

Github github.com 7 years ago
Cache

GitHub - idanarye/vim-dutyl: Coordinate D tools to work together for you

INTRODUCTION Dutyl operates various Dlang tools to help you program D in Vim. Instead of having a separate plugin for each tool, Dutyl can use multiple plugins and use them together - for example, use DUB to get a list of import paths the...

120