diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2022-02-27 18:29:45 +0000 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2022-02-27 18:29:45 +0000 |
| commit | 22dc0efc112aab7cccac887151a9b47bf06cb1d7 (patch) | |
| tree | b9aafdc20dcbe060e265c26fbbc9a00ef6f17dbd | |
| parent | 3afffe980aba1a6f4734692d1bc82f077bcbadd1 (diff) | |
| download | dotfiles-22dc0efc112aab7cccac887151a9b47bf06cb1d7.tar.gz dotfiles-22dc0efc112aab7cccac887151a9b47bf06cb1d7.zip | |
Add better conflict resolution to git config
| -rw-r--r-- | git/.gitconfig | 6 | ||||
| -rwxr-xr-x | install.sh | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index ea6c0eb..61ee177 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -16,3 +16,9 @@ [commit] gpgsign = true + +[merge] + conflictstyle = diff3 + +[credential] + helper = store @@ -23,7 +23,7 @@ function print_help { function ln_configs { if [[ $FORCE -eq 1 ]]; then - rm -rI $2 + rm -f $2 fi ln $EXTRA_OPTS ${SCRIPT_DIR}/$1 $2 } |