diff --git a/home/.config/git/config b/home/.config/git/config index 2400e83..1b8e87a 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,25 +1,25 @@ # This is Git's per-user configuration file. [user] - name = ItsDrike - email = itsdrike@protonmail.com - signingkey = FB8CA11A2CF3A843 + name = ItsDrike + email = itsdrike@protonmail.com + signingkey = FB8CA11A2CF3A843 [credential] - helper = store --file ~/.config/git/git-credentials + helper = store --file ~/.config/git/git-credentials [alias] - l = "log --oneline --decorate --all --graph" - lol = "log --pretty=oneline --abbrev-commit --graph" - lg = "log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --" + l = "log --oneline --decorate --all --graph" + lol = "log --pretty=oneline --abbrev-commit --graph" + lg = "log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --" find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'" show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'" [merge] - tool = meld + tool = meld [mergetool] - keepbackup = false - keeptemporaries = false + keepbackup = false + keeptemporaries = false [diff] - tool = meld + tool = meld [commit] - gpgsign = true + gpgsign = true [gpg] - program = /usr/bin/gpg + program = /usr/bin/gpg