diff options
| -rw-r--r-- | dot-gitconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/dot-gitconfig b/dot-gitconfig index 86c0d5aa..fa49189c 100644 --- a/dot-gitconfig +++ b/dot-gitconfig @@ -29,7 +29,14 @@ gpgSign = true [rebase] autosquash = true + updateRefs = true [core] - sshCommand = ssh -p 222 + sshCommand = ssh -p 2002 [merge] ff = false + conflictStyle = "diff3" +[lfs] + cachecredentials = true +[merge "mergiraf"] + name = mergiraf + driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L |