aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--%HOME%/.gitconfig35
1 files changed, 23 insertions, 12 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig
index ae90746..47ecb6a 100644
--- a/%HOME%/.gitconfig
+++ b/%HOME%/.gitconfig
@@ -4,12 +4,32 @@
[core]
editor = vim
autocrlf = false
-[push]
- default = current
+
+[diff]
+ # Include submodule changes into git-diff's output.
+ submodule = log
+[fetch]
+ # Prune old branches:
+ prune = true
+ # Prune old tags (since Git 2.17.0):
+ pruneTags = true
+[include]
+ # Include a file with work-specific settings (like a different [user]
+ # section under a specific directory).
+ path = ~/.gitconfig_work
+[log]
+ follow = true
[mergetool]
keepBackup = false
[pull]
+ # Don't create a merge commit, fast-forward only.
ff = only
+[push]
+ # If no refspec is given, push to the branch with the same name.
+ default = current
+[status]
+ submoduleSummary = true
+
[alias]
clean-all = clean -fdx
clean-ignored = clean -fdX
@@ -27,18 +47,9 @@
hide = update-index --skip-worktree
unhide = update-index --no-skip-worktree
hidden = !git ls-files -v | grep --basic-regexp \"^\\([[:lower:]]\\|S\\)\"
-[fetch]
- prune = true
-[log]
- follow = true
-[include]
- path = ~/.gitconfig_work
+
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
-[diff]
- submodule = log
-[status]
- submoduleSummary = true