summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorSteph Enders <steph@senders.io>2023-03-30 12:19:14 -0400
committerSteph Enders <steph@senders.io>2023-03-30 12:19:14 -0400
commitda88a8ca391183a001ecc2e5a65009185087d99e (patch)
treedf50acec1bd0759c8f81d0ebcc0b498fa8b8acdb /.gitconfig
parentd4f9a97dda8f7428f170dad1da6111f72a6e327b (diff)
Update gitconfig with work settings and extensions
Allow more computer specific gitconfig extensions with: `~/.pc_local_gitconfig` this can override specific settings like email and also setup `includeIf` blocks for specific directories
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig31
1 files changed, 16 insertions, 15 deletions
diff --git a/.gitconfig b/.gitconfig
index 57ad831..083687f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,17 +1,23 @@
[alias]
-st = status -sb
-lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
-sum = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --summary
-blg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
-co = checkout
-df = diff
-cp = cherry-pick
-br = branch
+ st = status -sb
+ lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
+ sum = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative master..HEAD
+ co = checkout
+ df = diff
+ cp = cherry-pick
+ br = branch
+ amend = commit --amend --no-edit
+ fix = commit --fixup
+ autosquash = rebase -i --autosquash
+
[core]
excludesfile = ~/.gitignore
autocrlf = input
+[init]
+ defaultBranch = main
+
[user]
name = Steph Enders
email = "steph@senders.io"
@@ -23,11 +29,6 @@ br = branch
interactive = auto
branch = auto
-[filter "lfs"]
- clean = git-lfs clean -- %f
- smudge = git-lfs smudge -- %f
- process = git-lfs filter-process
- required = true
+[include]
+ path = ~/.pc_local_gitconfig
-[init]
- defaultBranch=main