-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
48 lines (48 loc) · 1.95 KB
/
.gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
[user]
name = George Papanikolaou
email = g3orge.app@gmail.com
[github]
user = papanikge
[color]
ui = true
[core]
editor = vim --noplugin
[push]
default = current
[grep]
lineNumber = true
[alias]
co = checkout
br = branch
zip = archive --output latest.zip HEAD
pullsub = submodule foreach git pull
cp = cherry-pick
whodunit = blame
news = diff --stat HEAD@{1}..HEAD
head = log --graph --no-decorate --abbrev-commit --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%C(yellow)%d' --max-count=15 --
serve = daemon --base-path=. --export-all --reuseaddr --informative-errors --verbose
root = rev-parse --show-toplevel
yesterday = log --since '1 day ago' --oneline
files = log --oneline --graph --color --abbrev-commit --name-status --no-decorate
dc = diff --cached
wd = diff --word-diff
dn = diff --name-only
forget = update-index --assume-unchanged
unforget = update-index --no-assume-unchanged
fml = reset --hard
edit = !git rebase -i --autosquash $(git merge-base HEAD main)
pr-diff = !git diff $(git merge-base main HEAD)..$(git rev-parse --abbrev-ref HEAD)
contributors = shortlog --summary --numbered
day = "!__git_day() { git log --name-status --after=\"$1 0:00\" --before=\"$1 23:59\";}; __git_day"
when-merged = "!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'"
delete-merged = "!git branch --merged | grep -v '\\*' | grep -v main | xargs -n 1 git branch -d; git remote -v update -p"
[sendemail]
smtpserver = ~/.dotfiles/bin/msmtpq
[help]
autocorrect = 1
[rebase]
autosquash = true
[diff]
algorithm = histogram
[merge]
conflictstyle = diff3