diff options
Diffstat (limited to 'dotfiles/git')
| -rw-r--r-- | dotfiles/git/.gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dotfiles/git/.gitconfig b/dotfiles/git/.gitconfig index a675a80..4d36f82 100644 --- a/dotfiles/git/.gitconfig +++ b/dotfiles/git/.gitconfig @@ -14,3 +14,7 @@ conflictStyle = zdiff3 [alias] l = log --oneline +[pull] + rebase = true +[http "https://github.com"] + proxy = socks5h://127.0.0.1:1080 |