mirror of
https://github.com/Stunkymonkey/dotfiles.git
synced 2025-12-14 06:55:18 +01:00
git: fix gitlab-upstream fetch
This commit is contained in:
parent
f4b1d29447
commit
f37b123b82
1 changed files with 2 additions and 2 deletions
|
|
@ -31,13 +31,13 @@
|
||||||
[branch]
|
[branch]
|
||||||
autoSetupMerge = always
|
autoSetupMerge = always
|
||||||
# Fetch also the merge requests data for common remotes
|
# 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"]
|
[remote "origin"]
|
||||||
fetch = +refs/pull/*/head:refs/remotes/origin/pull/*
|
fetch = +refs/pull/*/head:refs/remotes/origin/pull/*
|
||||||
fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
|
fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
|
||||||
[remote "upstream"]
|
[remote "upstream"]
|
||||||
fetch = +refs/pull/*/head:refs/remotes/upstream/pull/*
|
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]
|
[diff]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
colorMoved = plain
|
colorMoved = plain
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue