diff options
| -rw-r--r-- | .config/git/config | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..5fc98ca --- /dev/null +++ b/.config/git/config @@ -0,0 +1,22 @@ +[user] + name = Alex Scerba + email = alex@scerba.org + signingkey = alex@scerba.org +#[commit] +# gpgsign = true +#[tag] +# gpgSign = true +[color] + ui = true +[init] + defaultBranch = master +[core] + hooksPath = ~/.config/git/hooks +[alias] + l = log --all --oneline --graph --decorate +#[pull] +# rebase = true +[merge] + conflictstyle = zdiff3 +[diff] + algorithm = histogram |