joao.dubas/ide
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

feat: improve git configuration

Browse Source 
Setup based on:

* [tips and tricks in gitbutler][0]
* [git mergetool with vim][1]

[0]: https://blog.gitbutler.com/git-tips-and-tricks/
[1]: https://gist.github.com/karenyyng/f19ff75c60f18b4b8149
This commit is contained in:
João Paulo Dubas 2024-02-13 23:07:48 +00:00
parent 387a7dfef2
commit ff6a67ab2f
Signed by: joao.dubas
SSH Key Fingerprint: SHA256:ARe2mtya5B5Jubp6H/lf5i94DXLj7iAaqXpR5Uq+3Xc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -194,7 +194,14 @@ ARG GIT_USER_EMAIL
ARG GIT_USER_NAME
RUN git config --global user.email "${GIT_USER_EMAIL}" \
&& git config --global user.name "${GIT_USER_NAME}" \
&& git config --global core.editor nvim
&& git config --global core.editor nvim \
&& git config --global diff.tool nvimdiff \
&& git config --global difftool.nvimdiff.layout "LOCAL,REMOTE" \
&& git config --global merge.tool nvimdiff \
&& git config --global mergetool.nvimdiff.layout "LOCAL,BASE,REMOTE / MERGED" \
&& git config --global includeIf."hasconfig:remote.*.url:gitea:*/**".path ${XDG_CONFIG_HOME}/git/personal_gitea \
&& git config --global includeIf."hasconfig:remote.*.url:github:joaodubas/**".path ${XDG_CONFIG_HOME}/git/personal_github \
&& git config --global includeIf."gitdir:/opt/work".path ${XDG_CONFIG_HOME}/git/work \
COPY ./scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
COPY ./scripts/elixir-ls-setup.sh /usr/local/bin/elixir-ls-setup