2020-01-26 17:28:29 +01:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
git config --global user.name "Dirk Alders"
|
|
|
|
git config --global user.email dirk@mount-mockery.de
|
|
|
|
#
|
2025-01-06 15:08:11 +01:00
|
|
|
git config --global pull.rebase false
|
|
|
|
#
|
2020-01-26 17:28:29 +01:00
|
|
|
git config --global diff.tool meld
|
|
|
|
git config --global merge.tool meld
|
2025-01-06 15:08:11 +01:00
|
|
|
git config --global merge.tool.cmd 'meld --auto-merge "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"'
|
2023-09-30 09:04:12 +02:00
|
|
|
git config --global --add difftool.prompt false
|
2025-01-06 15:08:11 +01:00
|
|
|
#
|
|
|
|
git config --global config credential.helper store
|
|
|
|
|