Skip to content

Instantly share code, notes, and snippets.

@hrach
Created June 12, 2017 13:38
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save hrach/8b9a3885205f13c6f3ade7616495771b to your computer and use it in GitHub Desktop.
Save hrach/8b9a3885205f13c6f3ade7616495771b to your computer and use it in GitHub Desktop.
[user]
useconfigonly = true
email = ...
name = ...
[core]
excludesfile = ~/.gitignore_global
fscache = true
editor = 'C:/Soft_x86/NPP/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
autocrlf = Input
[color]
ui = auto
diff = auto
status = auto
branch = auto
interactive = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[alias]
s = status
p = push
pf = push --force-with-lease
pu = push -u
c = checkout
l = log --pretty=format:'%Cred%h%Creset | %Cgreen%s%Creset [%ar by %an]'
g = log --all --graph --decorate --oneline
graph = log --all --graph --decorate --oneline
pr = pull --rebase --prune
rc = rebase --continue
rs = rebase --skip
ra = rebase --abort
mt = mergetool
rim = rebase -i master
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
ff = false
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = \"/c/Soft_x64/WinMerge/WinMergeU.exe\" \"$MERGED\"
[diff]
tool = winmerge
algorithm = default
guitool = winmerge
indentHeuristic = true
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = \"C:/Soft_x64/WinMerge/winmergeu.exe\" -e -u \"$LOCAL\" \"$REMOTE\"
path = C:/Soft_x64/WinMerge/winmergeu.exe
[gui]
encoding = utf-8
fontdiff = -family \"Fira Code\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0
recentrepo = D:/storage/backend
[filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true
[push]
default = current
[pull]
ff = only
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment