sponsor Vim development Vim logo Vim Book Ad

Merginal : Fugitive extention to manage and merge Git branches

 script karma  Rating 0/0, Downloaded by 152    Comments, bugs, improvements  Vim wiki

created by
Idan Arye
 
script type
utility
 
description
GitHub repository: https://github.com/idanarye/vim-merginal

Merginal aims provide a nice inteface 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
* Solving merge conflicts
* Interacting with remotes(pulling, pushing, fetching, tracking)
* Diffing against other branches
* Renaming branches
 
install details
 

rate this script Life Changing Helpful Unfulfilling 
script versions (upload new version)

Click on the package to download.

package script version date Vim version user release notes
merginal_v1.4.0.zip 1.4.0 2014-09-19 7.0 Idan Arye - Add the `rn` keymap for renaming branches
- Add a buffer type for `rebase-amend`
- Add `pS` command for force pushing branches
merginal_v1.3.0.zip 1.3.0 2014-08-11 7.0 Idan Arye - Add the `rb` keymap to start a rebase.
  - The rebase buffer supports the merge buffer's keymaps(`R`, `<Cr>`,
    `aa`, `A`).
  - The rebase buffer also support `ra` to abort the rebase, `rc` to
    continue to the next patch and `rs` to skip the current patch.
- Add `MerginalToggle` command to toggle the merginal buffer.
- Add `MerginalClose` command to close the merginal buffer.
- Support `ps`, `pl` and `pf` directly on remote branches.
- Fix a bug with non-linear merges that don't have merge conflicts.
merginal_v1.2.0.zip 1.2.0 2014-07-07 7.0 Idan Arye - Add the `mf` keymap to run Fugitive's `:Gmerge`
- Add `merginal#branchDetails` for better parsing of the branch info
- Add `ct` and `cT` for tracking remote branches
- Add `ps`,`pl` and `pf` to push, pull and fetch branches
- Make `dd` be able to delete remote branches
- `bd` in the branch list opens the diff files buffer to diff against the
   selected branch.
merginal_v1.1.0.zip 1.1.0 2014-06-06 7.0 Idan Arye Made it more plugin-friendly
merginal_v1.0.0.zip 1.0.0 2014-06-04 7.0 Idan Arye Initial upload
ip used for rating: 54.205.253.132

If you have questions or remarks about this site, visit the vimonline development pages. Please use this site responsibly.
Questions about Vim should go to the maillist. Help Bram help Uganda.
   
SourceForge.net Logo