summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/git/attributes1
-rw-r--r--.config/git/config3
2 files changed, 4 insertions, 0 deletions
diff --git a/.config/git/attributes b/.config/git/attributes
new file mode 100644
index 0000000..56444aa
--- /dev/null
+++ b/.config/git/attributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
diff --git a/.config/git/config b/.config/git/config
index 3404c0c..dbc9346 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -5,6 +5,9 @@
ui = auto
[push]
default = matching
+[merge "merge-changelog"]
+ name = GNU-style ChangeLog merge driver
+ driver =git-merge-changelog %O %A %B
[alias]
lg = log --graph --format='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
hist = log --format='%h %ci -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit