From f37b123b82f1f05378063ccc30981d452fe56f83 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 28 Nov 2025 22:01:11 +0100 Subject: [PATCH] git: fix gitlab-upstream fetch --- git/gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git/gitconfig b/git/gitconfig index e3915ed..0e3dbc5 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -31,13 +31,13 @@ [branch] autoSetupMerge = always # Fetch also the merge requests data for common remotes -# GitHub uses the "pull" space, GitLab the "merge-requests" +# GitHub uses "pull/*", GitLab uses "merge-requests/*" [remote "origin"] fetch = +refs/pull/*/head:refs/remotes/origin/pull/* fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* [remote "upstream"] fetch = +refs/pull/*/head:refs/remotes/upstream/pull/* - fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* + fetch = +refs/merge-requests/*/head:refs/remotes/upstream/merge-requests/* [diff] tool = vimdiff colorMoved = plain