diff options
| author | Corinna Vinschen <vinschen@redhat.com> | 2015-03-09 22:53:11 +0300 |
|---|---|---|
| committer | Corinna Vinschen <vinschen@redhat.com> | 2015-03-09 22:53:11 +0300 |
| commit | ef54a0e301c9d4a10a53f286abb82c573ca673b5 (patch) | |
| tree | 6cc27cad4a7555c26987d8aefb0e7e388eb53c95 /.gitattributes | |
| parent | 5a97e28f6a103523c0ab7092c9ac0d270fb7b680 (diff) | |
Add .gitattributes
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..06d51d28a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,20 @@ +# -*- conf -*- + +## Set merge driver for ChangeLog files +# See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1)) +# for per-user setup instructions. +# +# The short version of this (optional) procedure is: +# +# (1) Install git-merge-changelog (this is the tricky part!) +# +# (2) Add something like the following to your ~/.gitconfig: +# +# [merge "merge-changelog"] +# name = GNU-style ChangeLog merge driver +# driver = git-merge-changelog %O %A %B +# +# (3) Enjoy mostly effortless ChangeLog merges, at least until the +# file gets renamed again ... + +ChangeLog merge=merge-changelog |