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:17:25 -0500 |
| commit | 8e046f1b3f39bd2c5bca498965c7d082057982dd (patch) | |
| tree | a71cd76784235e276d7d35b686542ae723ebe593 | |
| parent | c3dec27c4819b3b825423e5774dc044412d29222 (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 6e5abf2..21efa65 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 |