diff options
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 2 |
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 |