[user]
name = Mr. Example
email = email@example.com
signingkey = GPGKEY
[gpg]
program = gpg2
[credential]
helper = osxkeychain
[commit]
gpgsign = false
[push]
default = simple
[fetch]
prune = true
[pull]
rebase = true
[color]
ui = auto
branch = auto
diff = auto
status = auto
[log]
decorate = true
abbrevCommit = true
showSignature = true
[diff]
noprefix = true
relative = true
compactionHeuristic = true
tool = Kaleidoscope
[rebase]
autosquash = true
autoStash = true
[alias]
wdiff = diff --word-diff
wshow = show --word-diff
viz = log --graph --pretty=oneline
llog = log --pretty=oneline
slog = log ----shortstat
changelog = log --date=short --no-merges --pretty=format:'%ad %an <%ae> %n%s%n%b'
today = log --oneline --since='1 days ago'
logshow = log --stat
ci = commit
co = checkout
nb = checkout -b
tar = archive --format=tar HEAD -o
tgz = archive --format=tgz HEAD -o
zip = archive --format=zip HEAD -o
vranch = branch -avv
staged = diff --cached
scommit = commit -S
sfcommit = commit -S -s
stag = tag -s
find = !git ls-files|grep
resetmaster = !git stash && git checkout master && git clean -fdx && git pull --rebase && git stash pop
overwrite = push --force-with-lease
[mergetool "vimdiff3"]
cmd = ~/bin/vimdiff3 \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
[mergetool]
keepBackup = true
prompt = false
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[mergetool "Kaleidoscope"]
[difftool "Kaleidoscope"]
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
More than 5 years have passed since last update.
Register as a new user and use Qiita more conveniently
- You get articles that match your needs
- You can efficiently read back useful information
- You can use dark theme