mirror of
https://github.com/bertptrs/vimconfig.git
synced 2025-12-27 13:30:31 +01:00
Compare commits
2 Commits
3304a568bf
...
565df72597
| Author | SHA1 | Date | |
|---|---|---|---|
| 565df72597 | |||
| 59db612d3a |
@@ -41,6 +41,7 @@
|
||||
pushf = push --force-with-lease
|
||||
fixup = commit --fixup=@
|
||||
master = !git fetch && git checkout -B master origin/master
|
||||
del = branch -D
|
||||
|
||||
[rebase]
|
||||
autosquash = true
|
||||
@@ -57,8 +58,14 @@
|
||||
[blame]
|
||||
# Ignore certain commits while generating "git blame." Filename taken from
|
||||
# Github's pseudo-standard
|
||||
ignoreRevsFile = .git-blame-ignore-revs
|
||||
# Mark any lines that have had a commit skipped using --ignore-rev with a `?`
|
||||
#
|
||||
# 2023-01-26: Enabling this by default causes blame to fail in all repos
|
||||
# that do not have it. Not desirable behaviour. Should be manually enabled
|
||||
# per-repo.
|
||||
#
|
||||
# ignoreRevsFile = .git-blame-ignore-revs Mark any lines that have had a
|
||||
# commit skipped using --ignore-rev with a `?`
|
||||
markIgnoredLines = true
|
||||
# Mark any lines that were added in a skipped commit and can not be attributed with a `*`
|
||||
# Mark any lines that were added in a skipped commit and can not be
|
||||
# attributed with a `*`
|
||||
markUnblamableLines = true
|
||||
|
||||
@@ -300,3 +300,8 @@ fi
|
||||
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then
|
||||
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
||||
fi
|
||||
|
||||
# Initialize direnv if available
|
||||
if (($+commands[direnv])); then
|
||||
eval "$(direnv hook zsh)"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user