| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
| |
The use of the "union" merge driver to avoid conflicts in NEWS has
proven to be problematic, as it often silently produced mis-merges
(instead of spurious conflicts, but a spurious conflict is better
than a mis-merge). Also, our new branching policy (see automake
bug#11153 for a description) should greatly mitigate the problem of
merge conflicts in NEWS. For further discussion, see:
<http://lists.gnu.org/archive/html/automake-patches/2012-04/msg00148.html>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
|
| |
|
|
|
|
| |
* .gitattributes: We don't maintain a version-controlled ChangeLog
file anymore, so we have no need to specify a custom merge driver
for it anymore. Update accordingly.
|
| |
|
|
|
|
|
|
|
|
|
| |
This should help in reducing the spurious merge conflicts for the
NEWS file, which have already caused a great deal of confusion and
wasted time.
Suggestion by Eric Blake:
http://lists.gnu.org/archive/html/automake-patches/2012-02/msg00119.html
* .gitattributes (NEWS): Use the "union" merge driver.
|
| |
|
|
|
|
| |
* .gitattributes: Annotate *.texi* files for texinfo diff.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
* .gitattributes: Use merge-changelog driver for ChangeLog.
* .gitignore: Ignore configure.lineno, config.status.lineno.
|
