aboutsummaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
authorMathias Bynens <mathias@qiwi.be>2012-03-13 15:28:48 +0100
committerMathias Bynens <mathias@qiwi.be>2012-03-13 15:28:48 +0100
commit4f4c3421d0e948b5114f5e9f859b2bd6ada60adc (patch)
tree3f1a5b8b6d75ffdd5693d882d3d8d4fca809467f /.gitconfig
parentfc1f806b9d044392c9d725c6d0363ba23efc6524 (diff)
downloaddotfiles-4f4c3421d0e948b5114f5e9f859b2bd6ada60adc.tar.gz
dotfiles-4f4c3421d0e948b5114f5e9f859b2bd6ada60adc.tar.bz2
dotfiles-4f4c3421d0e948b5114f5e9f859b2bd6ada60adc.zip
.gitconfig: Use `origin` as the default remote on the `master` branch
Apparently there are cases where this is not the default: http://stackoverflow.com/q/658885/96656 Hat tip to @cowboy.
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 33bfb98..a58312d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -47,6 +47,11 @@
# Include summaries of merged commits in newly created merge commit messages
log = true
+# Use `origin` as the default remote on the `master` branch in all cases
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
+
# URL shorthands
[url "git@github.com:"]
insteadOf = "gh:"