From bac1508b1e52e2f487b22e4215ad040d32967f22 Mon Sep 17 00:00:00 2001 From: Christoffer Date: Mon, 14 Aug 2017 23:08:26 +0200 Subject: [PATCH] --- .gitconfig | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 218 insertions(+), 5 deletions(-) diff --git a/.gitconfig b/.gitconfig index 66ba969..9464b01 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,219 @@ [pack] - # Avoid large memory utilization on shared servers / shell accounts - windowMemory = 25m - packSizeLimit = 25m - threads = 1 - deltaCacheSize = 25m + # Avoid large memory utilization on shared servers / shell accounts + windowMemory = 25m + packSizeLimit = 25m + threads = 1 + deltaCacheSize = 25m +[core] + quotepath = false + excludesfile = ~/.gitignore + autocrlf = input + editor = vim + whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol +[web] + browser = googlechrome +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process +[filter "media"] + clean = git-media-clean %f + smudge = git-media-smudge %f +[user] + useConfigOnly = true +[push] + default = matching +[pull] + rebase = true +[rebase] + autoStash = true +[merge] + log = true + ff = false + renormalize = true + verbosity = 4 + tool = winmerge +[url "https://bitbucket.org/"] + insteadOf = bb: +[url "https://github.com/"] + insteadOf = gh: +[url "https://gist.github.com/"] + insteadOf = gist: +[url "https://gitlab.com/"] + insteadOf = gl: +[color] + ui = auto +[color "branch"] + current = yellow bold + local = green 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 +[gitflow "prefix"] + feature = feature/ + release = release/ + hotfix = hotfix/ + support = support/ + versiontag = v +[alias] + a = add --all + ai = add -i + ############# + ap = apply + as = apply --stat + ac = apply --check + ############# + ama = am --abort + amr = am --resolved + ams = am --skip + ############# + b = branch + ba = branch -a + bd = branch -d + br = branch -r + ############# + c = commit + ca = commit -a + cm = commit -m + cem = commit --allow-empty -m + cam = commit -am + cd = commit --amend + cad = commit -a --amend + ced = commit --allow-empty --amend + ############# + d = diff + dc = diff --cached + dl = difftool + dlc = difftool --cached + dk = diff --check + dp = diff --patience + dck = diff --cached --check + ############# + f = fetch + fo = fetch origin + fu = fetch upstream + ############# + fp = format-patch + ############# + fk = fsck + ############# + g = grep -p + ############# + l = log --oneline + lg = log --oneline --graph --decorate + ############# + ls = ls-files + lsf = "!git ls-files | grep -i" + ############# + m = merge + ma = merge --abort + mc = merge --continue + ms = merge --skip + merge-to = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f" + ############# + o = checkout + ob = checkout -b + ############# + pr = prune -v + ############# + ps = push + psf = push -f + psu = push -u + pso = push origin + psao = push --all origin + psfo = push -f origin + psuo = push -u origin + psom = push origin master + psfom = push -f origin master + psuom = push -u origin master + ############# + pl = pull + plu = pull -u + plo = pull origin + plp = pull upstream + plom = pull origin master + plpm = pull upstream master + ############# + pb = pull --rebase + pbo = pull --rebase origin + pbp = pull --rebase upstream + pbom = pull --rebase origin master + pbpm = pull --rebase upstream master + ############# + rb = rebase + rba = rebase --abort + rbc = rebase --continue + rbi = rebase --interactive + rbs = rebase --skip + ############# + re = reset + rh = reset HEAD + reh = reset --hard + rem = reset --mixed + res = reset --soft + rehh = reset --hard HEAD + remh = reset --mixed HEAD + resh = reset --soft HEAD + ############# + r = remote + ra = remote add + rr = remote rm + rv = remote -v + rm = remote rename + rp = remote prune + rs = remote show + rao = remote add origin + rau = remote add upstream + rso = remote show origin + rsu = remote show upstream + rpo = remote prune origin + rpu = remote prune upstream + ############# + s = status + sb = status -s -b + ############# + sa = stash apply + sc = stash clear + sd = stash drop + sl = stash list + sp = stash pop + ss = stash save + sw = stash show + ############# + w = show + wp = show -p + wr = show -p --no-color + ############# + svnr = svn rebase + svnd = svn dcommit + svnl = svn log --oneline --show-commit + ############# + assume = update-index --assume-unchanged --verbose + unassume = update-index --no-assume-unchanged --verbose + assumed = "!git ls-files -v | grep ^h | cut -c 3-" + unassumeall = !git assumed | xargs git update-index --no-assume-unchanged + assumeall = "!git st -s | awk {'print $2'} | xargs git assume" + replace = update-index --verbose --replace + ############# + ours = "!f() { git checkout --ours $@ && git add $@; }; f" + theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" + ############# + whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -" + whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short + ############# + barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' - + flat = clone --depth 1 + subpull = !git submodule foreach git pull --tags origin master + subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' - + human = name-rev --name-only --refs=refs/heads/* + serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git + snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"