126

GitHub - hotwatermorning/auto-git-diff: A vim plugin which shows git diff for Gi...

 6 years ago
source link: https://github.com/hotwatermorning/auto-git-diff
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.

Show git diff for Git Rebase Interactive

auto-git-diff is a vim plugin which shows git diff between each commit and its parent commit below the commit list window of git rebase interactive.

When you move a text-cursor in git-rebase-todo file, auto-git-diff gets a commit hash of the line where the cursor exists and update the diff window.

sample_image

Variables

  • g:auto_git_diff_disable_auto_update

If this variable is set to 1, the diff window won't update automatically. You can update the diff window manually with the following key mapping: <Plug>(auto_git_diff_manual_update).

  • g:auto_git_diff_show_window_at_right

If this variable is set to 1, the diff window will be created at right on the commit list window.

  • g:auto_git_diff_command_options

The options passed to git diff command. If this variable is not defined, --stat -p --submodule -C -C will be used.

Mappings

  • <Plug>(auto_git_diff_manual_update)

This key mapping updates the diff window manully.

  • <Plug>(auto_git_diff_scroll_down_1)
  • <Plug>(auto_git_diff_scroll_up_1)
  • <Plug>(auto_git_diff_scroll_down_half)
  • <Plug>(auto_git_diff_scroll_up_half)
  • <Plug>(auto_git_diff_scroll_down_page)
  • <Plug>(auto_git_diff_scroll_up_page)

These key mappings scroll the diff window without moving the cursor into the window. _1 means scrolling one line (<C-e> or <C-y>), _half means scrolling half a page (<C-d> or <C-u>) and _page means scrolling one page (<C-f> or <C-b>).

Following is an example to configure the mappings in your vimrc.

function! s:setup_auto_git_diff() abort
    nmap <buffer><C-l> <Plug>(auto_git_diff_scroll_manual_update)
    nmap <buffer><C-n> <Plug>(auto_git_diff_scroll_down_half)
    nmap <buffer><C-p> <Plug>(auto_git_diff_scroll_up_half)
endfunction
autocmd FileType gitrebase call <SID>setup_auto_git_diff()

License

The MIT License (MIT)
Copyright (c) 2015 hotwatermorning

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

About Joyk


Aggregate valuable and interesting links.
Joyk means Joy of geeK