mirror of
https://github.com/Lissy93/dotfiles.git
synced 2025-06-26 12:01:21 +02:00
Moves git config
This commit is contained in:
Alicia Sykes
parent
31cd172ec5
commit
b2783fa689
@ -1,4 +0,0 @@
|
||||
[interactive]
|
||||
diffFilter = diff-so-fancy --patch
|
||||
[pull]
|
||||
rebase = false
|
||||
@ -1,50 +1,67 @@
|
||||
# -----------------------------------------------------------------------------
|
||||
# Global Git Configuration
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
[user]
|
||||
name = Alicia Sykes
|
||||
email = alicia@omg.lol
|
||||
username = lissy93
|
||||
|
||||
[init]
|
||||
defaultBranch = master
|
||||
defaultBranch = main
|
||||
|
||||
[pull]
|
||||
# If you want `git pull` to always rebase, set this to true
|
||||
rebase = false
|
||||
|
||||
[core]
|
||||
editor = nvim
|
||||
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
|
||||
pager = delta
|
||||
excludesfile = /Users/alicia/.config/.gitignore_global
|
||||
autocrlf = false
|
||||
symlinks = true
|
||||
|
||||
[web]
|
||||
browser = firefox
|
||||
[instaweb]
|
||||
httpd = apache2 -f
|
||||
|
||||
# [instaweb]
|
||||
# httpd = apache2 -f
|
||||
# Uncomment and configure if you actually use `git instaweb`
|
||||
|
||||
[rerere]
|
||||
enabled = 1
|
||||
autoupdate = 1
|
||||
|
||||
[color]
|
||||
ui = auto
|
||||
|
||||
[color "branch"]
|
||||
current = yellow bold
|
||||
local = purple bold
|
||||
remote = cyan bold
|
||||
|
||||
[color "diff"]
|
||||
meta = yellow bold
|
||||
frag = magenta bold
|
||||
old = red bold
|
||||
new = green bold
|
||||
whitespace = red reverse
|
||||
|
||||
[color "status"]
|
||||
added = green bold
|
||||
changed = yellow bold
|
||||
untracked = red bold
|
||||
|
||||
[diff]
|
||||
tool = vimdiff
|
||||
|
||||
[difftool]
|
||||
prompt = false
|
||||
|
||||
[delta]
|
||||
features = line-numbers decorations
|
||||
line-numbers = true
|
||||
|
||||
[delta "decorations"]
|
||||
minus-style = red bold normal
|
||||
plus-style = green bold normal
|
||||
@ -59,34 +76,40 @@
|
||||
minus-empty-line-marker-style = normal normal
|
||||
plus-empty-line-marker-style = normal normal
|
||||
line-numbers-right-format = "{np:^4}│ "
|
||||
# [github]
|
||||
# user = lissy93
|
||||
# token = token
|
||||
|
||||
[gitflow "prefix"]
|
||||
versiontag = v
|
||||
|
||||
[sequence]
|
||||
editor = interactive-rebase-tool
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Aliases
|
||||
# -----------------------------------------------------------------------------
|
||||
[alias]
|
||||
# Adding files
|
||||
a = add --all
|
||||
ai = add -i
|
||||
#############
|
||||
|
||||
# Apply patches
|
||||
ap = apply
|
||||
as = apply --stat
|
||||
ac = apply --check
|
||||
#############
|
||||
ama = am --abort
|
||||
amr = am --resolved
|
||||
ams = am --skip
|
||||
#############
|
||||
|
||||
# Branch management
|
||||
b = branch
|
||||
ba = branch -a
|
||||
bd = branch -d
|
||||
bdd = branch -D
|
||||
br = branch -r
|
||||
bc = rev-parse --abbrev-ref HEAD
|
||||
bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}"
|
||||
bs = !git-branch-status
|
||||
#############
|
||||
bu = "!git rev-parse --abbrev-ref --symbolic-full-name \"@{u}\""
|
||||
bs = "!git-branch-status"
|
||||
|
||||
# Commits
|
||||
c = commit
|
||||
ca = commit -a
|
||||
cm = commit -m
|
||||
@ -95,17 +118,20 @@
|
||||
cd = commit --amend
|
||||
cad = commit -a --amend
|
||||
ced = commit --allow-empty --amend
|
||||
#############
|
||||
|
||||
# Cloning
|
||||
cl = clone
|
||||
cld = clone --depth 1
|
||||
clg = !sh -c 'git clone git://github.com/$1 $(basename $1)' -
|
||||
clgp = !sh -c 'git clone git@github.com:$1 $(basename $1)' -
|
||||
clgu = !sh -c 'git clone git@github.com:$(git config --get user.username)/$1 $1' -
|
||||
#############
|
||||
clg = "!sh -c 'git clone git://github.com/$1 $(basename $1)' -"
|
||||
clgp = "!sh -c 'git clone git@github.com:$1 $(basename $1)' -"
|
||||
clgu = "!sh -c 'git clone git@github.com:$(git config --get user.username)/$1 $1' -"
|
||||
|
||||
# Cherry-pick
|
||||
cp = cherry-pick
|
||||
cpa = cherry-pick --abort
|
||||
cpc = cherry-pick --continue
|
||||
#############
|
||||
|
||||
# Diff
|
||||
d = diff
|
||||
dp = diff --patience
|
||||
dc = diff --cached
|
||||
@ -113,77 +139,86 @@
|
||||
dck = diff --cached --check
|
||||
dt = difftool
|
||||
dct = difftool --cached
|
||||
#############
|
||||
|
||||
# Fetch
|
||||
f = fetch
|
||||
fo = fetch origin
|
||||
fu = fetch upstream
|
||||
#############
|
||||
|
||||
# Format patch
|
||||
fp = format-patch
|
||||
#############
|
||||
|
||||
# Fsck
|
||||
fk = fsck
|
||||
#############
|
||||
|
||||
# Grep
|
||||
g = grep -p
|
||||
#############
|
||||
|
||||
# Log
|
||||
l = log --oneline
|
||||
lg = log --oneline --graph --decorate
|
||||
#############
|
||||
|
||||
# Ls-files
|
||||
ls = ls-files
|
||||
lsf = !git ls-files | grep -i
|
||||
#############
|
||||
lsf = "!git ls-files | grep -i"
|
||||
|
||||
# Merge
|
||||
m = merge
|
||||
ma = merge --abort
|
||||
mc = merge --continue
|
||||
ms = merge --skip
|
||||
#############
|
||||
|
||||
# Checkout
|
||||
o = checkout
|
||||
om = checkout master
|
||||
ob = checkout -b
|
||||
opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1'
|
||||
#############
|
||||
opr = "!sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1' -"
|
||||
|
||||
# Prune
|
||||
pr = prune -v
|
||||
#############
|
||||
|
||||
# Push
|
||||
ps = push
|
||||
psf = push -f
|
||||
psu = push -u
|
||||
pst = push --tags
|
||||
#############
|
||||
pso = push origin
|
||||
psao = push --all origin
|
||||
psfo = push -f origin
|
||||
psuo = push -u origin
|
||||
#############
|
||||
psom = push origin master
|
||||
psaom = push --all origin master
|
||||
psfom = push -f origin master
|
||||
psuom = push -u origin master
|
||||
psoc = !git push origin $(git bc)
|
||||
psaoc = !git push --all origin $(git bc)
|
||||
psfoc = !git push -f origin $(git bc)
|
||||
psuoc = !git push -u origin $(git bc)
|
||||
psdc = !git push origin :$(git bc)
|
||||
#############
|
||||
psoc = "!git push origin $(git bc)"
|
||||
psaoc = "!git push --all origin $(git bc)"
|
||||
psfoc = "!git push -f origin $(git bc)"
|
||||
psuoc = "!git push -u origin $(git bc)"
|
||||
psdc = "!git push origin :$(git bc)"
|
||||
|
||||
# Pull
|
||||
pl = pull
|
||||
pb = pull --rebase
|
||||
#############
|
||||
plo = pull origin
|
||||
pbo = pull --rebase origin
|
||||
plom = pull origin master
|
||||
ploc = !git pull origin $(git bc)
|
||||
ploc = "!git pull origin $(git bc)"
|
||||
pbom = pull --rebase origin master
|
||||
pboc = !git pull --rebase origin $(git bc)
|
||||
#############
|
||||
pboc = "!git pull --rebase origin $(git bc)"
|
||||
plu = pull upstream
|
||||
plum = pull upstream master
|
||||
pluc = !git pull upstream $(git bc)
|
||||
pluc = "!git pull upstream $(git bc)"
|
||||
pbum = pull --rebase upstream master
|
||||
pbuc = !git pull --rebase upstream $(git bc)
|
||||
#############
|
||||
pbuc = "!git pull --rebase upstream $(git bc)"
|
||||
|
||||
# Rebase
|
||||
rb = rebase
|
||||
rba = rebase --abort
|
||||
rbc = rebase --continue
|
||||
rbi = rebase --interactive
|
||||
rbs = rebase --skip
|
||||
#############
|
||||
|
||||
# Reset
|
||||
re = reset
|
||||
rh = reset HEAD
|
||||
reh = reset --hard
|
||||
@ -193,7 +228,8 @@
|
||||
remh = reset --mixed HEAD
|
||||
resh = reset --soft HEAD
|
||||
rehom = reset --hard origin/master
|
||||
#############
|
||||
|
||||
# Remote
|
||||
r = remote
|
||||
ra = remote add
|
||||
rr = remote rm
|
||||
@ -209,13 +245,16 @@
|
||||
rsu = remote show upstream
|
||||
rpo = remote prune origin
|
||||
rpu = remote prune upstream
|
||||
#############
|
||||
|
||||
# Remove
|
||||
rmf = rm -f
|
||||
rmrf = rm -r -f
|
||||
#############
|
||||
|
||||
# Status
|
||||
s = status
|
||||
sb = status -s -b
|
||||
#############
|
||||
|
||||
# Stash
|
||||
sa = stash apply
|
||||
sc = stash clear
|
||||
sd = stash drop
|
||||
@ -224,61 +263,70 @@
|
||||
ss = stash save
|
||||
ssk = stash save -k
|
||||
sw = stash show
|
||||
st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*'
|
||||
#############
|
||||
st = "!git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*'"
|
||||
|
||||
# Tag
|
||||
t = tag
|
||||
td = tag -d
|
||||
#############
|
||||
|
||||
# Show
|
||||
w = show
|
||||
wp = show -p
|
||||
wr = show -p --no-color
|
||||
#############
|
||||
|
||||
# SVN (if used)
|
||||
svnr = svn rebase
|
||||
svnd = svn dcommit
|
||||
svnl = svn log --oneline --show-commit
|
||||
#############
|
||||
subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' -
|
||||
subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' -
|
||||
|
||||
# Submodules
|
||||
subadd = "!sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' -"
|
||||
subrm = "!sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' -"
|
||||
subup = submodule update --init --recursive
|
||||
subpull = !git submodule foreach git pull --tags -f origin master
|
||||
#############
|
||||
subpull = "!git submodule foreach git pull --tags -f origin master"
|
||||
|
||||
# Assume untracked
|
||||
assume = update-index --assume-unchanged
|
||||
unassume = update-index --no-assume-unchanged
|
||||
assumed = !git ls -v | grep ^h | cut -c 3-
|
||||
unassumeall = !git assumed | xargs git unassume
|
||||
assumeall = !git status -s | awk {'print $2'} | xargs git assume
|
||||
#############
|
||||
bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -
|
||||
release = !sh -c 'git tag v$1 && git pst' -
|
||||
unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' -
|
||||
merged = !sh -c 'git o master && git plom && git bd $1 && git rpo' -
|
||||
aliases = !git config -l | grep alias | cut -c 7-
|
||||
snap = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}'
|
||||
bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
|
||||
whois = !sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' -
|
||||
assumed = "!git ls -v | grep ^h | cut -c 3-"
|
||||
unassumeall = "!git assumed | xargs git unassume"
|
||||
assumeall = "!git status -s | awk {'print $2'} | xargs git assume"
|
||||
|
||||
# Releases / versioning
|
||||
bump = "!sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -"
|
||||
release = "!sh -c 'git tag v$1 && git pst' -"
|
||||
unrelease = "!sh -c 'git tag -d v$1 && git pso :v$1' -"
|
||||
merged = "!sh -c 'git o master && git plom && git bd $1 && git rpo' -"
|
||||
|
||||
# Utilities
|
||||
aliases = "!git config -l | grep alias | cut -c 7-"
|
||||
snap = "!git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}'"
|
||||
bare = "!sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -"
|
||||
whois = "!sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' -"
|
||||
serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
|
||||
#############
|
||||
behind = !git rev-list --left-only --count $(git bu)...HEAD
|
||||
ahead = !git rev-list --right-only --count $(git bu)...HEAD
|
||||
#############
|
||||
behind = "!git rev-list --left-only --count $(git bu)...HEAD"
|
||||
ahead = "!git rev-list --right-only --count $(git bu)...HEAD"
|
||||
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
|
||||
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
|
||||
subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -
|
||||
human = name-rev --name-only --refs=refs/heads/*
|
||||
subrepo = "!sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -"
|
||||
human = "name-rev --name-only --refs=refs/heads/*"
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Git LFS
|
||||
# -----------------------------------------------------------------------------
|
||||
[filter "lfs"]
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# If you have Sourcetree installed, you can leave this. Otherwise, comment out.
|
||||
# -----------------------------------------------------------------------------
|
||||
[difftool "sourcetree"]
|
||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
||||
cmd = opendiff "$LOCAL" "$REMOTE"
|
||||
path =
|
||||
[mergetool "sourcetree"]
|
||||
cmd = /Users/alicia/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
||||
trustExitCode = true
|
||||
[remote "origin"]
|
||||
url = https://github.com/Homebrew/brew
|
||||
fetch = +refs/heads/*:refs/remotes/origin/*
|
||||
[homebrew]
|
||||
analyticsmessage = true
|
||||
caskanalyticsmessage = true
|
||||
|
||||
# [mergetool "sourcetree"]
|
||||
# cmd = /Users/alicia/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"
|
||||
# trustExitCode = true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user