summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-12-17 15:35:24 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-12-17 15:35:24 -0500
commite2695b4531ba74a09da84985c104b95536b17e7b (patch)
tree57f3514b62a50efb2125dda039316b9e286a8f8a
parent765741080e2c10268536a30c7fad3c04458f14b2 (diff)
fix minor mistake in .gitconfig
-rw-r--r--.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index 17dfab8043..4bf35862eb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -63,7 +63,7 @@
merge = refs/heads/notsystemd/postmove
[branch "notsystemd/master"]
remote = origin
- merge = refs/heads/notsystemd/postmove
+ merge = refs/heads/notsystemd/master
[remote "r-autothing"]
url = git://lukeshu.com/autothing