sync/git/gitconfig

37 lines
1.2 KiB
Plaintext
Raw Normal View History

2014-04-19 13:25:29 -04:00
[user]
2014-11-14 09:20:04 -05:00
name = Austen Adler
2014-04-19 13:25:29 -04:00
email = stonewareslord@gmail.com
[alias]
i = "!git br&&git st"
2015-03-12 16:54:37 -04:00
# coa = "!for i in $(git branch -a|cut -b3-|grep remotes|sed -e 's/remotes\///'|cut -d/ -f1 --complement|cut -d\ -f1);do git checkout $i;done"
2014-05-30 12:45:50 -04:00
pul = pull
pus = push --all
2014-04-19 13:25:29 -04:00
co = checkout
ci = commit -m
a = add
2015-01-13 11:16:38 -05:00
aa = add --all
2014-04-19 13:25:29 -04:00
st = status
br = branch -av
2014-05-27 19:36:53 -04:00
hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
2014-09-12 19:03:40 -04:00
d = difftool
cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
nbranch = !sh -c 'git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i"
2015-01-14 22:27:59 -05:00
wipe = !sh -c 'git filter-branch --prune-empty -f --index-filter \\\\\"git rm -rf --cached --ignore-unmatch \\\"$1\\\"\\\\\" --tag-name-filter cat -- --all' -
2014-04-19 13:25:29 -04:00
[push]
2014-06-16 18:58:00 -04:00
default = matching
2014-04-19 13:25:29 -04:00
[core]
excludesfile = /home/stonewareslord/.gitignore_global
[diff]
2014-06-16 18:58:00 -04:00
tool = vimdiff
2014-04-19 13:25:29 -04:00
[difftool]
2014-06-16 18:58:00 -04:00
prompt = false
2014-04-19 13:25:29 -04:00
[merge]
tool = diffconflicts
[mergetool "diffconflicts"]
cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
trustExitCode = true
keepBackup = false
[credential]
2014-11-14 09:20:04 -05:00
helper = cache