rik/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing issues with gitconfig

Browse Source
This commit is contained in:
Nick Nisi
2013-02-05 21:15:40 -06:00
parent 99343b27a7
commit f233096c60
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
git/gitconfig.symlink
View File

@@ -58,10 +58,26 @@
diff = auto diff = auto
status = auto status = auto
branch = auto branch = auto
ui = true interactive = auto
ui = auto
[color "branch"]
current = green bold
local = green
remote = red bold
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = green bold
changed = yellow bold
untracked = red
[color "sh"]
branch = yellow
[push] [push]
# push to the upstream branch but only if it is the same name # push will only do the current branch, not all branches
default = simple default = current
[branch] [branch]
# set up 'git pull' to rebase instead of merge # set up 'git pull' to rebase instead of merge
autosetuprebase = always autosetuprebase = always
@@ -71,12 +87,5 @@
[core] [core]
excludesfile = ~/.gitignore_global excludesfile = ~/.gitignore_global
pager = less -FXRS -x2 pager = less -FXRS -x2
editor = vim
[apply]
# turn off trailing whitespace warning
whitespace = nowarn
[mergetool]
# remove backup files after a successful merge
keepBackup = false
[rerere] [rerere]
enabled = false enabled = false