lambdalisue/vim-gina

Use gina as merge tool

Open

#268 opened on Aug 6, 2020

View on GitHub
 (1 comment) (0 reactions) (0 assignees)Vim Script (28 forks)github user discovery
enhancementhelp wanted

Repository metrics

Stars
 (688 stars)
PR merge metrics
 (PR metrics pending)

Description

Accroding https://www.grzegorowski.com/using-vim-or-neovim-nvim-as-a-git-mergetool, vim can use vim-fugitive as git mergetool by following git config. How to use gina like this?

# define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# set "nvim" as tool for merging
[merge]
  tool = nvim
# automatically launch merge tool without displaying a prompt
[mergetool]
  prompt = false

Contributor guide

Research direction
Check gina's documentation for a command that works as a mergetool diff; replicate the fugitive configuration using the equivalent gina command.
Tech stack
None
Domain
tooling
Issue type
Feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
2
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
Under 1 hour
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Needs maintainer response
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
VimGit
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
70