diff options
Diffstat (limited to '')
| -rw-r--r-- | home/.config/git/config | 21 | ||||
| -rw-r--r-- | home/.config/git/ignore | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config new file mode 100644 index 00000000..36b96776 --- /dev/null +++ b/home/.config/git/config @@ -0,0 +1,21 @@ +[user] + name = June McEnroe + email = june@causal.agency + +[commit] + verbose = true + +[merge] + conflictStyle = diff3 + +[pull] + rebase = true + +[rebase] + autosquash = true + +[pretty] + log = %Cred%h %Creset%s%C(yellow)%d %Cgreen(%ar) %Cblue<%aN> + +[include] + path = ./private diff --git a/home/.config/git/ignore b/home/.config/git/ignore new file mode 100644 index 00000000..fea54519 --- /dev/null +++ b/home/.config/git/ignore @@ -0,0 +1,2 @@ +*.DS_store +*.dSYM/ |