diff options
Diffstat (limited to 'home/.config/git')
-rw-r--r-- | home/.config/git/config | 16 | ||||
-rw-r--r-- | home/.config/git/ignore | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index 094e0e71..2ed9809a 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,19 +1,19 @@ [user] - name = June McEnroe - email = june@causal.agency + name = June McEnroe + email = june@causal.agency [commit] - gpgSign = true - verbose = true + gpgSign = true + verbose = true [merge] - conflictStyle = diff3 + conflictStyle = diff3 [rebase] - autosquash = true + autosquash = true [pretty] - log = %Cred%h %Creset%s%C(yellow)%d %Cgreen(%ar) %Cblue<%an> + log = %Cred%h %Creset%s%C(yellow)%d %Cgreen(%ar) %Cblue<%an> [include] - path = ./private + path = ./private diff --git a/home/.config/git/ignore b/home/.config/git/ignore index 22bb82f8..fea54519 100644 --- a/home/.config/git/ignore +++ b/home/.config/git/ignore @@ -1,3 +1,2 @@ *.DS_store *.dSYM/ -.pult* |