Last active
July 15, 2019 21:37
-
-
Save kwokhou/238ac8ee811863bec1199fc5c9b81d4b to your computer and use it in GitHub Desktop.
Git config
This file contains 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
[user] | |
name = Some dude | |
email = somedude@gmail.com | |
[core] | |
excludesfile = /Users/somedude/.gitignore_global | |
editor = vi | |
pager = less -FRSX | |
whitespace = trailing-space,cr-at-eol | |
autocrlf = input | |
[color] | |
ui = auto | |
[color "branch"] | |
current = yellow reverse | |
local = yellow | |
remote = green | |
[color "diff"] | |
meta = white bold | |
frag = magenta bold | |
old = red bold | |
new = green bold | |
[color "status"] | |
added = yellow | |
changed = green | |
untracked = cyan | |
[alias] | |
st = status -s | |
co = checkout | |
ci = commit | |
br = branch | |
pt = push --follow-tags | |
merge = merge -b | |
lg = log -n25 --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | |
wipe = !git clean -fd && git reset --hard | |
tree = log --graph --pretty=oneline --decorate | |
fix = commit --amend -C HEAD | |
pop = reset --soft HEAD~1 | |
cp = cherry-pick | |
unadd = reset HEAD -- | |
standup = !git log --since yesterday --author `git config user.email` --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | |
ri = rebase -i @{u} | |
accept-ours = "!f() { [ -z \"$@\" ] && set - '.'; git checkout --ours -- \"$@\"; git add -u -- \"$@\"; }; f" | |
accept-theirs = "!f() { [ -z \"$@\" ] && set - '.'; git checkout --theirs -- \"$@\"; git add -u -- \"$@\"; }; f" | |
rollback = reset --hard origin/master | |
serve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/ | |
[apply] | |
whitespace = fix | |
[rebase] | |
autoStash = true | |
[pull] | |
rebase = true | |
[push] | |
default = simple | |
[credential] | |
helper = osxkeychain | |
[merge] | |
tool = opendiff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment