 
      
    | You are here | arnorhs.dev | ||
| | | | | nalanj.dev | |
| | | | | Alan Johnson's Personal Site | |
| | | | | connorberry.com | |
| | | | | Git with Vimdiff One time view: git difftool --tool=vimdiff --no-prompt Always: git config --global diff.tool vimdiff git config --global merge.tool vimdiff For Single Repository: git config diff.tool vimdiff git config merge.tool vimdiff To avoid having Git prompt when launching Vimdiff: git config --global difftool.prompt false | |
| | | | | www.aaron-gray.com | |
| | | | | You can run rubocop on just a local branches' changes like this: git fetch && git diff-tree -r --no-commit-id --name-only master@{u} head | xargs ls -1 2>/dev/null | xargs rubocop --force-exclusion Then you can create 2 corresponding aliases in your terminal .rc file to make this easy to remember: # Alias to run rubocop on the current branch's diff from [...] | |
| | | | | ericlathrop.com | |
| | | This weekend I gave a presentation on the Jekyll static site generator at MOSSCon. | ||