Skip to content

Commit

Permalink
Fix fzf GitBranch preview window revision/filename conflict
Browse files Browse the repository at this point in the history
Error:

    fatal: ambiguous argument 'foo': both revision and filename
  • Loading branch information
twe4ked committed Oct 15, 2016
1 parent cbbb4e2 commit b21e933
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion vim/plugin_config/fzf.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
command! FzfBranch call fzf#run({
\ 'source': 'git diff $(git merge-base origin/HEAD HEAD).. --name-only | sort -u | xargs find 2> /dev/null',
\ 'sink': 'edit',
\ 'options': '-m +s --prompt="GitBranch> " --preview ''(git diff --color=always {-1} | sed 1,4d; cat {-1}) | head -500''',
\ 'options': '-m +s --prompt="GitBranch> " --preview ''(git diff --color=always -- {-1} | sed 1,4d; cat {-1}) | head -500''',
\ 'down': '40%'
\ })

Expand Down

0 comments on commit b21e933

Please sign in to comment.