|
c2757b97
|
2017-09-19T13:43:07
|
|
maint: Reset master
|
|
018a1866
|
2012-04-26T17:47:14
|
|
maint: don't use "union" merge driver for NEWS anymore
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>
|
|
|
06684c51
|
2012-02-14T13:25:35
|
|
gitattributes: custom merge driver for ChangeLog not needed anymore
* .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.
|
|
|
f874f9ee
|
2012-02-14T13:21:26
|
|
gitattributes: use "union" merge driver for NEWS
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.
|
|
689a2b1b
|
2009-09-18T20:13:14
|
|
Update git attributes for texinfo files.
* .gitattributes: Annotate *.texi* files for texinfo diff.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
0a7e5fe4
|
2008-06-16T19:36:25
|
|
git metadata update.
* .gitattributes: Use merge-changelog driver for ChangeLog.
* .gitignore: Ignore configure.lineno, config.status.lineno.
|