|
From: | Paolo Bonzini |
Subject: | Re: [PATCH] Supporting git-merge-changelog |
Date: | Fri, 01 Aug 2008 20:53:43 +0200 |
User-agent: | Thunderbird 2.0.0.16 (Macintosh/20080707) |
Paolo Bonzini wrote:
I committed the following patch to bootstrap, so that git-merge-changelog is used if available.
And here is the .gitattributes file: diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e8495d5 --- a/.gitattributes +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog Paolo
[Prev in Thread] | Current Thread | [Next in Thread] |