Browse Source

Add .gitattributes

sh3port_dev
Corinna Vinschen 4 years ago
parent
commit
ef54a0e301
1 changed files with 20 additions and 0 deletions
  1. 20
    0
      .gitattributes

+ 20
- 0
.gitattributes View File

@@ -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

Loading…
Cancel
Save