diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-11-08 14:38:09 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-11-08 14:38:09 -0500 |
| commit | 4b418ee4900156ad98b316f31b7731d11837b164 (patch) | |
| tree | 177e865439248f116503b5a9027887f4c1ec2bc4 /.config/git/config | |
| parent | 73792d5157d709ebe3d5ff35563692ac04e89fbd (diff) | |
| parent | 3477cafcc1ecf1cefd2c36a7fac36c86443ea573 (diff) | |
Merge branch 'master' into gluglugt60-par/master
Diffstat (limited to '.config/git/config')
| -rw-r--r-- | .config/git/config | 3 |
1 files changed, 3 insertions, 0 deletions
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 |