Last active
December 29, 2020 17:14
-
-
Save KoltesDigital/77f8edaad5ac9c1b74d7e23051ba0a36 to your computer and use it in GitHub Desktop.
Git config
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[alias] | |
a = add | |
aa = add --all | |
ap = add -p | |
al = !git config -l | grep alias | cut -c 7- | |
b = branch | |
bd = branch -D | |
bl = !git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--' | |
bm = branch -m | |
bp = !git branch --merged master --no-color | grep -v ' master$' | xargs -n1 -r git branch -d | |
c = commit --verbose | |
ca = commit -a --verbose | |
cm = commit -m | |
cam = commit -a -m | |
cd = commit --amend --verbose | |
cad = commit -a --amend --verbose | |
cinit = commit --allow-empty -m 'chore: start project' | |
co = checkout | |
cob = checkout -b | |
com = checkout master | |
cp = cherry-pick | |
cpa = cherry-pick --abort | |
cpc = cherry-pick --continue | |
d = diff | |
ds = diff --stat | |
dc = diff --cached | |
fo = fetch origin | |
fu = fetch upstream | |
fi = flow init | |
fff = flow feature finish | |
ffph = flow feature publish | |
ffpl = flow feature pull | |
ffs = flow feature start | |
fhf = flow hotfix finish | |
fhs = flow hotfix start | |
frf = flow release finish | |
frph = flow release publish | |
frs = flow release start | |
frt = flow release track | |
initc = !git init && git commit --allow-empty -m 'chore: start project' | |
l = log --pretty=format:%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]--decorate --date=short | |
ma = merge --abort | |
mc = merge --continue | |
ms = merge --skip | |
mt = mergetool | |
pho = push origin | |
phuo = push -u origin | |
phuoh = push -u origin HEAD | |
plo = pull origin | |
plu = pull upstream | |
plro = pull -r origin | |
plru = pull -r upstream | |
quickserve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/ | |
re = restore | |
res = restore --staged | |
rb = rebase | |
rbi = rebase -i | |
rba = rebase --abort | |
rbc = rebase --continue | |
rbs = rebase --skip | |
rbo = rebase --onto | |
rao = remote add origin | |
rau = remote add upstream | |
rro = remote remove origin | |
rru = remote remove upstream | |
rh = reset HEAD | |
rhh = reset --hard HEAD | |
rp = reset HEAD~ | |
s = status -s | |
sa = stash apply | |
sk = stash --keep-index | |
skm = stash --keep-index -m | |
sku = stash --keep-index --include-untracked | |
skum = stash --keep-index --include-untracked -m | |
sl = stash list | |
sp = stash pop | |
ss = stash save | |
ssm = stash push -m | |
hide = update-index --assume-unchanged | |
show = update-index --no-assume-unchanged | |
[ci] | |
tool = kdiff3 | |
[citool "kdiff3"] | |
path = C:/Program Files/KDiff3/kdiff3.exe | |
trustExitCode = false | |
[diff] | |
guitool = kdiff3 | |
[difftool "kdiff3"] | |
path = C:/Program Files/KDiff3/kdiff3.exe | |
trustExitCode = false | |
cmd = \"C:/Program Files/KDiff3/kdiff3.exe\" \"$LOCAL\" \"$REMOTE\" | |
[merge] | |
tool = kdiff3 | |
guitool = kdiff3 | |
[mergetool "kdiff3"] | |
path = C:/Program Files/KDiff3/kdiff3.exe | |
trustExitCode = false | |
keepBackup = false | |
cmd = \"C:/Program Files/KDiff3/kdiff3.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" | |
[gui] | |
encoding = utf-8 | |
tabsize = 4 | |
[push] | |
followTags = true | |
[winUpdater] | |
recentlySeenVersion = 2.25.0.windows.1 | |
[filter "lfs"] | |
clean = git-lfs clean -- %f | |
smudge = git-lfs smudge -- %f | |
process = git-lfs filter-process | |
required = true | |
[pull] | |
rebase = true | |
[fetch] | |
prune = true | |
[rebase] | |
autoStash = true | |
[i18n] | |
filesEncoding = utf-8 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.pioenvs/ | |
.piolibdeps/ | |
.vscode/ | |
*.orig |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment