v2.2.3

Fixed

• Remove a stray echo when generating help for the various Merginal buffers.

v2.2.2

Fixed

• Replace fugitive#repo() usage with Fugitives standalone functions.

v2.2.1

Fixed

• Use FugitiveShellCommand instead of repo.git_command (which is deprecated by Fugitive)
• Use Git merge instead of Gmerge (which is deprecated by Fugitive)

v2.2.0

Added

• Support separate Meginal buffers on multiple tabs.
• Added merginal_remoteVisible variable to set remote branches to be viewed by default.
• Added a hotkey 'tr' to toggle remote branches in the view.

Changed

• Calling Merginal or MerginalToggle when the merginal buffer is open but not in the main mode (branch list by default, or changes if in special Git status) will:
  • Jump to it, if the user is in another window.
  • Change it to the main mode, if the user is in it.

v2.1.2 keep up with Fugitive changes

Fixed

• Made merginal commands global, not buffer-local, because Fugutive no longer fires the signals Merginal depended on.
• Changed fugitive#detect to FugitiveDetect.
• Made pS push with --force-with-lease instead of just --force. Yes, this is a fix. No this is not a breaking change. If this breaks your workflow then your workflow was broken to begin with.
• Made all the mappings <nowait>.

v2.1.1 bug fixes

• Fix fileFullPath bug (thanks @deresmos )
• Fix order of arguments when merging (thanks @krimha)
• Limit amount of commits displayed (thanks @sfahlberg)
  This is considered a bugfix and not a feature because the only reason for
  limiting the commit was performance.
• Fix a typo in historyLog.vim.

v2.1.0 various stuff

New features:

• Add NERDTree style keymaps for opening files
• Use committer date instead of author date in historyLog
• Allow setting the Merginal window width
• Add option to split vertically/horizontally
• Add merginal_windowSize configuration

Fixes:

• Use exception number instead of string
• Fix try catch to has_key
• Add missing merge commands to mergeConflicts buffer
• Pushing when there are multiple remotes
• Keymaps leaking between buffers
• Add -- after commands to solve branch/path ambiguity
• Fix command running for Vim8 with :terminal support

Fix refresh - prevent it from modifying other windows

2.0.2

Update bugfix version

Fix things related to the transition to the modules system

• Add the missing open-conflicted-file command from v1
• Fix the way filtering works in history log

Merginal 2.0.0!

• Huge refactor - moving to object model
• Add built-in help(pressing ?)
• Add filtering(pressing &)
• Minor bug fixes