gbranden pushed a commit to branch master
in repository groff.
commit c553cb57fcd3f236e473ca8f6b13ee373bec3f57
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Jan 20 15:14:58 2026 -0600
bootstrap: Resync with upstream.
---
ChangeLog | 4 ++++
bootstrap | 9 +++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 48a706581..9e3c3a2a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2026-01-20 G. Branden Robinson <[email protected]>
+
+ * bootstrap: Resync with upstream.
+
2026-01-20 G. Branden Robinson <[email protected]>
* gnulib: Update to stable/2026-01.
diff --git a/bootstrap b/bootstrap
index a15c4f574..19f9424bb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -5,7 +5,7 @@
scriptversion=2025-06-10.02; # UTC
-# Copyright (C) 2003-2025 Free Software Foundation, Inc.
+# Copyright (C) 2003-2026 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -37,9 +37,9 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2025-09-07.23; # UTC
+scriptlibversion=2025-12-04.19; # UTC
-# Copyright (C) 2003-2025 Free Software Foundation, Inc.
+# Copyright (C) 2003-2026 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -861,7 +861,8 @@ autopull()
elif check_exists git-merge-changelog; then
echo "$0: initializing git-merge-changelog driver"
git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
- git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+ git config merge.merge-changelog.driver \
+ 'git-merge-changelog %O %A %B "%Y"'
else
echo "$0: consider installing git-merge-changelog from gnulib"
fi
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
