diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-11-08 14:13:26 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-11-08 14:13:26 -0500 |
| commit | bc2448409e3ac8204c29008a2f52b05f886728b5 (patch) | |
| tree | 5323c1e6c477333abb9e9dfad4fc9400b6583eae | |
| parent | 117ad46b3d9211316d58a61770391b7f965896df (diff) | |
git: Use git-merge-changelog if available
| -rw-r--r-- | .config/git/attributes | 1 | ||||
| -rw-r--r-- | .config/git/config | 3 |
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 |