felix/dotfiles
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/dotfiles.git synced 2026-03-13 03:24:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: felix:f37b123b82f1f05378063ccc30981d452fe56f83
Branches Tags
felix:master
..
compare: felix:830b08cb6442015690dd80ab7fd685af2cd14aed
Branches Tags
felix:master

No commits in common. "f37b123b82f1f05378063ccc30981d452fe56f83" and "830b08cb6442015690dd80ab7fd685af2cd14aed" have entirely different histories.
f37b123b82 ... 830b08cb64

2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
git/gitconfig
View file

@ -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 "pull/*", GitLab uses "merge-requests/*" # GitHub uses the "pull" space, GitLab the "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/upstream/merge-requests/* fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
[diff] [diff]
tool = vimdiff tool = vimdiff
colorMoved = plain colorMoved = plain

2
sway/config
View file

@ -40,7 +40,7 @@ exec swayidle -w \
exec mako exec mako
exec syncthing serve --no-browser exec syncthing serve --no-browser
exec blueman-applet exec blueman-applet
exec Telegram -startintray exec telegram-desktop -startintray
exec gammastep-indicator exec gammastep-indicator
exec nextcloud --background exec nextcloud --background
exec io.gitlab.news_flash.NewsFlash --headless exec io.gitlab.news_flash.NewsFlash --headless