Skip to content

Instantly share code, notes, and snippets.

@Symbolk
Last active August 20, 2019 14:30
Show Gist options
  • Save Symbolk/4624c3694b6fe195f42e02a93012f71a to your computer and use it in GitHub Desktop.
Save Symbolk/4624c3694b6fe195f42e02a93012f71a to your computer and use it in GitHub Desktop.
My Git Config
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[user]
name = Symbolk
email = symbolk@163.com
[alias]
c = clone
s = status
sp = status --porcelain
pl = pull
pu = push
d = diff
m = merge
ma = merge --abort
a = add
au = add -u
cm = commit -m
cam = commit --amend
l = log
co = checkout
rv = remote -v
b = branch
bD = branch -D
ba = branch -a
bvv = branch -vv
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
lm = log --merges
eva = diff --ignore-cr-at-eol --ignore-all-space --ignore-blank-lines --ignore-space-change --no-index -U0
parents = rev-list --parents -n 1
# Get the child commit of the current commit.
# Use $1 instead of 'HEAD' if given. Use $2 instead of curent branch if given.
child = "!bash -c 'git log --format=%H --reverse --ancestry-path ${1:-HEAD}..${2:\"$(git rev-parse --abbrev-ref HEAD)\"} | head -1' -"
# For the current (or specified) commit-ish, get the all children, print the first child
# Change the $1 to $* to print all the children.
children = "!bash -c 'c=${1:-HEAD}; set -- $(git rev-list --all --not \"$c\"^@ --children | grep $(git rev-parse \"$c\") ); shift; echo $1' -"
[core]
attributesfile = ~/.gitattributes
[merge]
conflictstyle = diff3
[rerere]
enabled = true
[merge]
tool = bc4
guitool = kdiff3
conflictstyle = diff3
[mergetool "bc4"]
path = D:/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe
cmd = D:/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
prompt = false
keepBackup = false
trustExitCode = true
[mergetool "kdiff3"]
path = C:/Program\\ Files/KDiff3/kdiff3.exe
cmd = C:/Program\\ Files/KDiff3/kdiff3.exe "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
trustExitCode = false
[mergetool "meld"]
path = C:/Program\\ Files\\ (x86)/Meld/Meld.exe
cmd = C:/Program\\ Files\\ (x86)/Meld/Meld.exe "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
trustExitCode = false
[mergetool "imui"]
path = D:/coding/pku/IntelliMerge-UI/dist_electron/win-unpacked/IntelliMerge-UI.exe
cmd = D:/coding/pku/IntelliMerge-UI/dist_electron/win-unpacked/IntelliMerge-UI.exe "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
trustExitCode = false
[merge "s3m"]
name = semi_structured_3_way_merge_tool_for_java
driver = java -jar "\"F:/workspace/dev/jFSTMerge/binary/jFSTMerge.jar\"" -f %A %O %B -o %A -g
[merge "im"]
name = intellimerge
driver = java -jar "\"F:/workspace/dev/IntelliMerge/build/libs/IntelliMerge-1.0.7-all.jar\"" -f %A %O %B -o %A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment