[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: GNU-style ChangeLog merge driver for Git
From: |
Bruno Haible |
Subject: |
Re: GNU-style ChangeLog merge driver for Git |
Date: |
Mon, 11 Feb 2008 13:35:08 +0100 |
User-agent: |
KMail/1.5.4 |
> The README and installation instructions are in the source code (for now).
It turns out that we can put the .gitattributes into the repository: if someone
does not have the git-merge-changelog configured, it will have no effect for
him.
I also renamed it from "cl-merge" to "merge-changelog", for clarity.
2008-02-11 Bruno Haible <address@hidden>
* .gitattributes: New file.
============================== .gitattributes ===============================
ChangeLog merge=merge-changelog
=============================================================================
- Re: GNU-style ChangeLog merge driver for Git, (continued)
- Re: GNU-style ChangeLog merge driver for Git, Alfred M. Szmidt, 2008/02/11
- Re: GNU-style ChangeLog merge driver for Git, Karl Berry, 2008/02/11
- Re: GNU-style ChangeLog merge driver for Git, Micah Cowan, 2008/02/11
- Re: GNU-style ChangeLog merge driver for Git, James Youngman, 2008/02/12
- Re: GNU-style ChangeLog merge driver for Git, Bruno Haible, 2008/02/12
- Re: GNU-style ChangeLog merge driver for Git, Jim Meyering, 2008/02/12
Re: GNU-style ChangeLog merge driver for Git, Ralf Wildenhues, 2008/02/10
Re: GNU-style ChangeLog merge driver for Git,
Bruno Haible <=
Re: GNU-style ChangeLog merge driver for Git, Ralf Wildenhues, 2008/02/11
Re: GNU-style ChangeLog merge driver for Git, Jim Meyering, 2008/02/11
Re: GNU-style ChangeLog merge driver for Git, Eric Blake, 2008/02/14