Last active
March 26, 2020 12:04
-
-
Save verticonaut/78be0d73dbcb467275fa8ca23b9ae2e3 to your computer and use it in GitHub Desktop.
Global gitconfig file
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 = <yourname> | |
email = <youre email> | |
[alias] | |
co = checkout | |
unpushed = diff origin/master..HEAD --name-status | |
rpo = remote prune origin | |
notmerged = branch --no-merged | |
merged = branch --merged | |
[color] | |
diff = auto | |
status = auto | |
branch = auto | |
[core] | |
excludesfile = ~/.gitignore | |
editor = subl -n -w | |
autocrlf = input | |
hookspath = ~/.dotfiles/git-scripts/hooks/ | |
[apply] | |
whitespace = nowarn | |
[format] | |
pretty = %C(yellow)%h%Creset %s %C(red)(%cr)%Creset | |
[github] | |
user = verticonaut | |
token = c6391d41b5b8b6e2be9885813c1bc44b2477beb0 | |
[push] | |
default = simple | |
[tag] | |
sort = creatordate | |
[diff] | |
tool = meld | |
[difftool] | |
prompt = false | |
[difftool "meld"] | |
cmd = meld "$LOCAL" "$REMOTE" | |
[merge] | |
tool = meld | |
[mergetool "meld"] | |
# Choose one of these 2 lines (not both!) explained below. | |
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED" | |
# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment