Skip to content

Commit

Permalink
configure union merge for Changelog*.next.asciidoc (elastic#10003) (e…
Browse files Browse the repository at this point in the history
…lastic#10024)

* configure union merge for Changelog*.next.asciidoc

This change automatically merges Changelog*.next.asciidoc files when
merging or rebasing via `merge=union`. No more need to fix changelog
files when doing `git rebase master`.

* Remove union merge from Changelog.asciidoc

(cherry picked from commit 64453fd)
  • Loading branch information
Steffen Siering authored Jan 16, 2019
1 parent f5461ae commit 2a3ede2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CHANGELOG.md merge=union
CHANGELOG.asciidoc merge=union
CHANGELOG.next.asciidoc merge=union
CHANGELOG-developer.next.asciidoc merge=union

# Keep these file types as CRLF (Windows).
*.bat text eol=crlf
Expand Down

0 comments on commit 2a3ede2

Please sign in to comment.