2014-04-19 13:25:29 -04:00
|
|
|
[alias]
|
2014-06-08 20:52:22 -04:00
|
|
|
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
|
2017-04-30 13:14:50 -04:00
|
|
|
aci = commit -am
|
|
|
|
aaci = "!git add --all;git commit -m"
|
2016-04-14 13:30:37 -04:00
|
|
|
setup = "!git init;git commit --allow-empty -m 'Initial commit'"
|
2014-04-19 13:25:29 -04:00
|
|
|
a = add
|
2015-01-13 11:16:38 -05:00
|
|
|
aa = add --all
|
2014-04-19 13:25:29 -04:00
|
|
|
st = status
|
2014-05-17 14:09:38 -04:00
|
|
|
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
|
2014-06-28 02:16:07 -04:00
|
|
|
cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
|
2014-08-30 15:59:01 -04:00
|
|
|
nbranch = !sh -c 'git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
|
2014-07-23 19:19:52 -04:00
|
|
|
size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i"
|
2015-11-26 23:21:47 -05:00
|
|
|
x = "!exec "
|
2015-08-03 10:46:02 -04:00
|
|
|
unstage = reset HEAD --
|
2017-08-14 01:16:39 -04:00
|
|
|
up = pull --rebase --autostash
|
|
|
|
ignore = update-index --assume-unchanged
|
|
|
|
noignore = update-index --no-assume-unchanged
|
2017-08-29 11:42:06 -04:00
|
|
|
rename-branch = branch -m
|
2017-11-19 23:14:12 -05:00
|
|
|
find-file = "!for branch in $(git for-each-ref --format=\"%(refname)\" refs/heads); do if git ls-tree -r --name-only $branch | grep \"$1\" > /dev/null; then echo \"${branch}:\"; git ls-tree -r --name-only $branch | nl -bn -w3 | grep \"$1\"; fi; done; :"
|
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
|
2016-07-22 16:46:35 -04:00
|
|
|
ignorecase = false
|
2014-04-19 13:25:29 -04:00
|
|
|
[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
|
2014-10-05 15:30:26 -04:00
|
|
|
[credential]
|
2014-11-14 09:20:04 -05:00
|
|
|
helper = cache
|
2015-09-11 11:05:34 -04:00
|
|
|
[color]
|
2016-06-16 19:27:57 -04:00
|
|
|
ui = auto
|
2016-04-21 14:09:55 -04:00
|
|
|
[gui]
|
2017-07-11 09:25:25 -04:00
|
|
|
[filter "lfs"]
|
2017-08-14 01:16:39 -04:00
|
|
|
required = true
|
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
process = git-lfs filter-process
|