sixam/eurn
1
0
Fork 0
mirror of https://gitlab.com/lunovox/e-urn.git synced 2025-09-22 11:26:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Node de Urna Eletrônica

Browse source
This commit is contained in:
Lunovox 2023-07-20 10:14:38 -03:00
parent 3e87edc32f
commit 9e07ee1525
12 changed files with 836 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.gitconfig Normal file
View file

@ -0,0 +1,23 @@
[user]
email = lunovox@disroot.org
name = Lunovox Heavenfinder
[alias]
nlog = log --oneline --decorate --all --graph -n 10
# Add the following to your .gitconfig file.
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE" #
# Add the following to your .gitconfig file.
[merge]
tool = meld
[mergetool "meld"]
# Choose one of these 2 lines (not both!) explained below.
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"