meineerde/dotfiles
1
0
Fork 0
mirror of https://github.com/meineerde/dotfiles.git synced 2026-02-18 01:22:00 +00:00
Code Issues Releases Activity

Rebase by default on git pull

Browse Source
This commit is contained in:
Holger Just 2014-04-03 13:04:59 +02:00
parent c159feadbd
commit 47a3cda1f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitconfig
View File

@ -4,7 +4,6 @@
st = status st = status
co = checkout co = checkout
merge = merge --no-ff merge = merge --no-ff
pull = pull --rebase
ci = commit ci = commit
cm = commit cm = commit
p = push p = push
@ -32,6 +31,7 @@
[credential] [credential]
helper=osxkeychain helper=osxkeychain
[branch] [branch]
autosetupmerge = always autosetupmerge = true
autosetuprebase = always
[http] [http]
postBuffer = 5242880000 postBuffer = 5242880000