From e2695b4531ba74a09da84985c104b95536b17e7b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 17 Dec 2016 15:35:24 -0500 Subject: fix minor mistake in .gitconfig --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf