Skip to content

Instantly share code, notes, and snippets.

@joonhwan
Last active August 19, 2021 01:12
Show Gist options
  • Save joonhwan/ed71e0bdfa3cc916bcd665fc1ab71eee to your computer and use it in GitHub Desktop.
Save joonhwan/ed71e0bdfa3cc916bcd665fc1ab71eee to your computer and use it in GitHub Desktop.
gitconfig @ office
[core]
# editor = code --wait
pager = less -x4
trustctime = false
filemode = false
compression = 0
quotepath = false
autocrlf = true
fscache = true
preloadindex = true
commitGraph = true
longpaths = true
symlinks = true
[user]
name = 이준환
email = joonhwan.lee@mirero.co.kr
[color]
branch = auto
diff = auto
status = auto
ui = true
[color "branch"]
current = red reverse
local = blue
remote = green
[color "diff"]
meta = yellow
frag = magenta
old = red bold
new = green
plain = white
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
st = status
cl = clone
ci = commit
cm = commit -m
cma = commit -a -m
ca = commit --amend
amend = commit --amend
caa = commit -a --amend -C HEAD
filelog = log -u
fl = log -u
ai = add --interactive
co = checkout
br = branch
bra = branch -ra
le = log --oneline --decorate --remotes --branches
ls = log --pretty=format:%C(green)%h\\ %C(yellow)[%ad]%Cblue[%cn]%Creset%<(50,trunc)%s%<(20,trunc)%Cred%d\\ --decorate --date=format:'%Y/%m/%d %H:%M:%S'
ll = log --pretty=format:%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]--decorate --numstat
ls1 = log --pretty=format:%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn] --decorate
lds = log --pretty=format:%C(yellow)%h\\ %C(green)%ad%Cred%d%Creset\\ [%cn]\\ %<(20)%s --decorate --date=format:%y/%m/%d_%H:%M:%S --graph
ldsa = log --pretty=format:%C(yellow)%h\\ %C(green)%ad%Cred%d%Creset\\ [%cn]\\ %<(20)%s --decorate --date=format:%y/%m/%d_%H:%M:%S --graph --remotes --branches
ldsan = log --pretty=format:%C(yellow)%h\\ %C(green)%ad%Cred%d%Creset\\ [%cn]\\ %<(20)%s --decorate --date=format:%y/%m/%d_%H:%M:%S --graph --remotes --branches --name-status
ldsn = log --pretty=format:%C(yellow)%h\\ %C(green)%ad%Cred%d%Creset\\ [%cn]\\ %<(20)%s --decorate --date=format:%y/%m/%d_%H:%M:%S --graph --name-status
lc = "!f() { git ll $1^..$1; }; f"
lnc = log --pretty=format:%h\\ %s\\ [%cn]
la = !git config -l | grep alias | cut -c 7-
diff = diff --word-diff
d = diff --word-diff
dc = diff --cached
dl = !git ll -1
dlc = diff --cached HEAD^
dr = "!f() { git diff -w $1^..$1; }; f"
diffr = "!f() { git diff $1^..$1; }; f"
branch = branch -ra
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
rbp = rebase -p
svnr = svn rebase
svnd = svn dcommit
svnl = svn log --oneline --show-commit
sl = stash list
sa = stash apply
ss = stash save
cp = cherry-pick
grep = grep -Ii
gr = grep -Ii
gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"
f = !git ls-files | grep -i
done = "!f() { git branch | grep $1 | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
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
lasttag = describe --tags --abbrev=0
lt = describe --tags --abbrev=0
ours = "!f() { git co --ours $@ && git add $@; }; f"
theirs = "!f() { git co --theirs $@ && git add $@; }; f"
rem = !git config -l | grep remote.*url | tail -n +2
lap = "!f() { git --git-dir=$1 format-patch -k -1 --stdout $2 | git am -3 -k; }; f"
sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
empty = !git commit -am\"[empty] Initial commit\" --allow-empty
ra = "!f() { git remote add $1 https://bitbucket.org/$2.git; }; f"
gm = merge --no-ff
arch = archive -o
difft = difftool -y
fo = fetch origin
po = pull --rebase origin
unstage = reset HEAD --
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative --all
[gui]
fontdiff = -family D2Coding -size 10 -weight normal -slant roman -underline 0 -overstrike 0
encoding = utf-8
[diff]
tool = winmerge
guitool = winmerge
[difftool "p4merge"]
cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[difftool "winmerge"]
cmd = "'c:/dev/winmerge/winmergeu.exe'" -e "$LOCAL" "$REMOTE"
[merge]
tool = winmerge
[mergetool "p4merge"]
cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool "tortoisemerge"]
cmd = c:/dev/svn/bin/TortoiseMerge.exe -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = 'c:/dev/winmerge/WinMergeU.exe' -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
[sendemail]
smtpencryption = auto
smtpserver = mail.mirero.co.kr
smtpserver = migw.mirero.co.kr
smtpuser = joonhwan.lee@mirero.co.kr
smtpserverport = 25
smtppass = ADGqet135!
[push]
default = matching
[mergetool]
keepbackups = false
keeptemporaries = false
prompt = false
trustexitcode = false
[http]
postBuffer = 524288000
[winUpdater]
recentlySeenVersion = 2.25.0.windows.1
[mergetool "TortoiseMerge"]
cmd = c:/dev/svn/bin/TortoiseMerge.exe -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
[pull]
rebase = false
[fetch]
prune = false
[rebase]
autoStash = false
[guitool "external diff"]
cmd = git difftool $FILENAME
noconsole = yes
needsfile = yes
[gc]
writeCommitGraph = true
[receive]
advertisePushOptions = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[credential]
helper = manager
[i18n]
logOutputEncoding = cp949
commitEncoding = cp949
@joonhwan
Copy link
Author

git 2.23 for windows 부터

  • logOutputEncoding
  • commitEncoding

설정이 안되어 있으면, LC_ALL 환경변수가 무엇으로 설정되건 상관없이 인코딩이 깨졌다.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment