|
|
@@ -17,6 +17,12 @@ key = '~/.ssh/id_ed25519.pub'
|
|
|
[git]
|
|
|
sign-on-push = true
|
|
|
|
|
|
+[merge-tools.mergiraf]
|
|
|
+program = 'mergiraf'
|
|
|
+merge-args = ['merge', '$base', '$left', '$right', '-o', '$output']
|
|
|
+merge-conflict-exit-codes = [1]
|
|
|
+conflict-marker-style = 'git'
|
|
|
+
|
|
|
[aliases]
|
|
|
d = ['diff']
|
|
|
l = ['log', '-r', '(trunk()..@):: | ancestors(trunk()..@, 4) | bookmarks()', '-T', 'log_medium']
|
