diff --git a/git/gitconfig b/git/gitconfig index 0e3dbc5..e3915ed 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 "pull/*", GitLab uses "merge-requests/*" +# GitHub uses the "pull" space, GitLab the "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/upstream/merge-requests/* + fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* [diff] tool = vimdiff colorMoved = plain diff --git a/sway/config b/sway/config index 40d79fb..180a692 100644 --- a/sway/config +++ b/sway/config @@ -40,7 +40,7 @@ exec swayidle -w \ exec mako exec syncthing serve --no-browser exec blueman-applet -exec Telegram -startintray +exec telegram-desktop -startintray exec gammastep-indicator exec nextcloud --background exec io.gitlab.news_flash.NewsFlash --headless