Compare commits
3 commits
d3e325db86
...
5952e32bce
| Author | SHA1 | Date | |
|---|---|---|---|
| 5952e32bce | |||
| 8b6e338fc2 | |||
| 8a57725f15 |
2 changed files with 18 additions and 13 deletions
|
|
@ -171,7 +171,7 @@ return {
|
||||||
conflict = { suffix = "" }, -- disable to use git-conflict instead
|
conflict = { suffix = "" }, -- disable to use git-conflict instead
|
||||||
diagnostic = { suffix = "d", options = {} },
|
diagnostic = { suffix = "d", options = {} },
|
||||||
file = { suffix = "", options = {} },
|
file = { suffix = "", options = {} },
|
||||||
indent = { suffix = "" }, -- disable since we use indentscope above
|
indent = { suffix = "" }, -- disable since we use indentscope
|
||||||
jump = { suffix = "j", options = {} },
|
jump = { suffix = "j", options = {} },
|
||||||
location = { suffix = "l", options = {} },
|
location = { suffix = "l", options = {} },
|
||||||
oldfile = { suffix = "o", options = {} }, -- FIXME: overwritten by wrapping defaults currently
|
oldfile = { suffix = "o", options = {} }, -- FIXME: overwritten by wrapping defaults currently
|
||||||
|
|
@ -201,7 +201,7 @@ return {
|
||||||
require("mini.indentscope").setup({
|
require("mini.indentscope").setup({
|
||||||
symbol = "│",
|
symbol = "│",
|
||||||
draw = { animation = require("mini.indentscope").gen_animation.none() },
|
draw = { animation = require("mini.indentscope").gen_animation.none() },
|
||||||
options = { indent_at_cursor = false },
|
options = { indent_at_cursor = false, n_lines = 2000 },
|
||||||
})
|
})
|
||||||
-- disable indentlines for terminals
|
-- disable indentlines for terminals
|
||||||
vim.api.nvim_create_autocmd("TermOpen", {
|
vim.api.nvim_create_autocmd("TermOpen", {
|
||||||
|
|
|
||||||
|
|
@ -20,23 +20,28 @@
|
||||||
smtpserver = "/usr/bin/msmtp"
|
smtpserver = "/usr/bin/msmtp"
|
||||||
annotate = yes
|
annotate = yes
|
||||||
[alias]
|
[alias]
|
||||||
ignore = "!gitignore -f"
|
ignore = "!gitignore -f" # requires gitignore script to be in PATH
|
||||||
last = "diff HEAD~ HEAD"
|
last = "diff HEAD~ HEAD"
|
||||||
pushall = "!git remote | xargs -I R git push R" # push to all connected remotes
|
pushall = "!git remote | xargs -I R git push R" # push to all connected remotes
|
||||||
fetchall = "!git remote | xargs -I R git fetch R" # fetch from all connected remotes
|
fetchall = "!git remote | xargs -I R git fetch R" # fetch from all connected remotes
|
||||||
diffword = "!git diff --word-diff=color --word-diff-regex='[0-9A-Za-z_]+'" # word-wise diff, good for prose
|
diffword = "!git diff --word-diff=color --word-diff-regex='[0-9A-Za-z_]+'" # word-wise diff, good for prose
|
||||||
diffsyn = "!git difftool --tool difftastic" # add syntax-driven diff using treesitter
|
diffsyn = "!git difftool --tool difftastic" # add syntax-driven diff using treesitter
|
||||||
diffside = "!DELTA_FEATURES='+side-by-side' git diff" # add side-by-side diffing
|
diffside = "!DELTA_FEATURES='+side-by-side' git diff" # add side-by-side diffing
|
||||||
delta = "![ $TERM_DARK = false ] && delta --light || delta" # Take care that we always display right color scheme
|
delta = "![ $TERM_DARK = false ] && delta --light || delta" # Take care that we always display right color scheme
|
||||||
|
|
||||||
|
# check out a github PR directly on the commandline, creates pr/4 or pr/<number> branch locally
|
||||||
|
pr = "!f() { git fetch -fu ${2:-$(git remote |grep ^github || echo origin)} refs/pull/$1/head:pr/$1 }; f"
|
||||||
|
# remove all pr/<number> local branches
|
||||||
|
pr-clean = "!git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true # sign commits as me
|
gpgsign = true # sign commits as me
|
||||||
verbose = true # Always show diff when preparing commit message
|
verbose = true # Always show diff when preparing commit message
|
||||||
[fetch]
|
[fetch]
|
||||||
prune = true # remove references to non-existent remote branches
|
prune = true # remove references to non-existent remote branches
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true # always rebase on pulling, obviates merge commits
|
rebase = true # always rebase on pulling, obviates merge commits
|
||||||
[diff]
|
[diff]
|
||||||
colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color
|
colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color
|
||||||
[difftool]
|
[difftool]
|
||||||
prompt = false
|
prompt = false
|
||||||
[difftool "difftastic"]
|
[difftool "difftastic"]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue