mirror of
https://github.com/bertptrs/vimconfig.git
synced 2025-12-25 20:40:32 +01:00
Git config fixes
This commit is contained in:
@@ -41,6 +41,7 @@
|
|||||||
pushf = push --force-with-lease
|
pushf = push --force-with-lease
|
||||||
fixup = commit --fixup=@
|
fixup = commit --fixup=@
|
||||||
master = !git fetch && git checkout -B master origin/master
|
master = !git fetch && git checkout -B master origin/master
|
||||||
|
del = branch -D
|
||||||
|
|
||||||
[rebase]
|
[rebase]
|
||||||
autosquash = true
|
autosquash = true
|
||||||
@@ -57,8 +58,14 @@
|
|||||||
[blame]
|
[blame]
|
||||||
# Ignore certain commits while generating "git blame." Filename taken from
|
# Ignore certain commits while generating "git blame." Filename taken from
|
||||||
# Github's pseudo-standard
|
# 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
|
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
|
markUnblamableLines = true
|
||||||
|
|||||||
Reference in New Issue
Block a user