diff options
| -rw-r--r-- | .gitattributes | 20 | ||||
| -rw-r--r-- | ChangeLog | 4 |
2 files changed, 24 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..06d51d2 --- /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 @@ -1,3 +1,7 @@ +2014-07-25 Samuel Bronson <naesten@gmail.com> + + * .gitattributes: New file for use with git-merge-changelog. + 2014-07-21 Joel Sherrill <joel.sherrill@oarcorp.com> Disable gdb for or1k*-*-* until supported |