mirror of
https://gitlab.com/lunovox/e-urn.git
synced 2025-03-15 15:31:21 +00:00
24 lines
561 B
INI
24 lines
561 B
INI
|
[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"
|