{"id":263,"date":"2008-05-29T13:45:39","date_gmt":"2008-05-29T12:45:39","guid":{"rendered":"http:\/\/cyberelk.net\/tim\/?p=263"},"modified":"2014-05-20T09:09:13","modified_gmt":"2014-05-20T08:09:13","slug":"git-merge-changelog","status":"publish","type":"post","link":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/","title":{"rendered":"git-merge-changelog"},"content":{"rendered":"<p>Bruno Haible&#8217;s git <a href=\"http:\/\/www.mail-archive.com\/bug-gnulib@gnu.org\/msg09183.html\">merge driver for GNU-style ChangeLog files<\/a> (<a href=\"http:\/\/git.sv.gnu.org\/gitweb\/?p=gnulib.git;a=blob;f=lib\/git-merge-changelog.c\">available in gnulib<\/a>) is really useful for those of us who prefer to document changes as we go along rather than all at once when committing them.\u00a0 Paolo Bonzini has <a href=\"http:\/\/www.mail-archive.com\/bug-gnulib@gnu.org\/msg09699.html\">posted a script<\/a> for packaging it into a tarball.<\/p>\n<p>Unfortunately it doesn&#8217;t seem to cope very well with having multiple ChangeLog entries added on the same date without separate date stamps, and I don&#8217;t know how to tell emacs to always add a new date stamp line when using it to add ChangeLog entries (C-x 4 a).<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Bruno Haible&#8217;s git merge driver for GNU-style ChangeLog files (available in gnulib) is really useful for those of us who prefer to document changes as we go along rather than all at once when committing them.\u00a0 Paolo Bonzini has posted a script for packaging it into a tarball. Unfortunately it doesn&#8217;t seem to cope very [&hellip;]<\/p>\n","protected":false},"author":4,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2}},"categories":[3],"tags":[],"class_list":["post-263","post","type-post","status-publish","format-standard","hentry","category-software"],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v27.4 - https:\/\/yoast.com\/product\/yoast-seo-wordpress\/ -->\n<title>git-merge-changelog - PRINT HEAD<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/\" \/>\n<meta property=\"og:locale\" content=\"en_GB\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"git-merge-changelog - PRINT HEAD\" \/>\n<meta property=\"og:description\" content=\"Bruno Haible&#8217;s git merge driver for GNU-style ChangeLog files (available in gnulib) is really useful for those of us who prefer to document changes as we go along rather than all at once when committing them.\u00a0 Paolo Bonzini has posted a script for packaging it into a tarball. Unfortunately it doesn&#8217;t seem to cope very [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/\" \/>\n<meta property=\"og:site_name\" content=\"PRINT HEAD\" \/>\n<meta property=\"article:published_time\" content=\"2008-05-29T12:45:39+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2014-05-20T08:09:13+00:00\" \/>\n<meta name=\"author\" content=\"Tim Waugh\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"Written by\" \/>\n\t<meta name=\"twitter:data1\" content=\"Tim Waugh\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\\\/\\\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/#article\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/\"},\"author\":{\"name\":\"Tim Waugh\",\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/#\\\/schema\\\/person\\\/23b749f30a67f1b1c6af17024fc94bf6\"},\"headline\":\"git-merge-changelog\",\"datePublished\":\"2008-05-29T12:45:39+00:00\",\"dateModified\":\"2014-05-20T08:09:13+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/\"},\"wordCount\":96,\"publisher\":{\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/#\\\/schema\\\/person\\\/23b749f30a67f1b1c6af17024fc94bf6\"},\"articleSection\":[\"Software\"],\"inLanguage\":\"en-GB\"},{\"@type\":\"WebPage\",\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/\",\"url\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/\",\"name\":\"git-merge-changelog - PRINT HEAD\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/#website\"},\"datePublished\":\"2008-05-29T12:45:39+00:00\",\"dateModified\":\"2014-05-20T08:09:13+00:00\",\"breadcrumb\":{\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/#breadcrumb\"},\"inLanguage\":\"en-GB\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/2008\\\/05\\\/29\\\/git-merge-changelog\\\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"git-merge-changelog\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/#website\",\"url\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/\",\"name\":\"PRINT HEAD\",\"description\":\"\",\"publisher\":{\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/#\\\/schema\\\/person\\\/23b749f30a67f1b1c6af17024fc94bf6\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"en-GB\"},{\"@type\":[\"Person\",\"Organization\"],\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/#\\\/schema\\\/person\\\/23b749f30a67f1b1c6af17024fc94bf6\",\"name\":\"Tim Waugh\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-GB\",\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/wp-content\\\/uploads\\\/2023\\\/01\\\/printhead.png\",\"url\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/wp-content\\\/uploads\\\/2023\\\/01\\\/printhead.png\",\"contentUrl\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/wp-content\\\/uploads\\\/2023\\\/01\\\/printhead.png\",\"width\":731,\"height\":140,\"caption\":\"Tim Waugh\"},\"logo\":{\"@id\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/wp-content\\\/uploads\\\/2023\\\/01\\\/printhead.png\"},\"sameAs\":[\"http:\\\/\\\/cyberelk.net\\\/tim\"],\"url\":\"https:\\\/\\\/cyberelk.net\\\/tim\\\/author\\\/twaugh\\\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"git-merge-changelog - PRINT HEAD","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/","og_locale":"en_GB","og_type":"article","og_title":"git-merge-changelog - PRINT HEAD","og_description":"Bruno Haible&#8217;s git merge driver for GNU-style ChangeLog files (available in gnulib) is really useful for those of us who prefer to document changes as we go along rather than all at once when committing them.\u00a0 Paolo Bonzini has posted a script for packaging it into a tarball. Unfortunately it doesn&#8217;t seem to cope very [&hellip;]","og_url":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/","og_site_name":"PRINT HEAD","article_published_time":"2008-05-29T12:45:39+00:00","article_modified_time":"2014-05-20T08:09:13+00:00","author":"Tim Waugh","twitter_card":"summary_large_image","twitter_misc":{"Written by":"Tim Waugh"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/#article","isPartOf":{"@id":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/"},"author":{"name":"Tim Waugh","@id":"https:\/\/cyberelk.net\/tim\/#\/schema\/person\/23b749f30a67f1b1c6af17024fc94bf6"},"headline":"git-merge-changelog","datePublished":"2008-05-29T12:45:39+00:00","dateModified":"2014-05-20T08:09:13+00:00","mainEntityOfPage":{"@id":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/"},"wordCount":96,"publisher":{"@id":"https:\/\/cyberelk.net\/tim\/#\/schema\/person\/23b749f30a67f1b1c6af17024fc94bf6"},"articleSection":["Software"],"inLanguage":"en-GB"},{"@type":"WebPage","@id":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/","url":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/","name":"git-merge-changelog - PRINT HEAD","isPartOf":{"@id":"https:\/\/cyberelk.net\/tim\/#website"},"datePublished":"2008-05-29T12:45:39+00:00","dateModified":"2014-05-20T08:09:13+00:00","breadcrumb":{"@id":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/#breadcrumb"},"inLanguage":"en-GB","potentialAction":[{"@type":"ReadAction","target":["https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/cyberelk.net\/tim\/2008\/05\/29\/git-merge-changelog\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/cyberelk.net\/tim\/"},{"@type":"ListItem","position":2,"name":"git-merge-changelog"}]},{"@type":"WebSite","@id":"https:\/\/cyberelk.net\/tim\/#website","url":"https:\/\/cyberelk.net\/tim\/","name":"PRINT HEAD","description":"","publisher":{"@id":"https:\/\/cyberelk.net\/tim\/#\/schema\/person\/23b749f30a67f1b1c6af17024fc94bf6"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/cyberelk.net\/tim\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"en-GB"},{"@type":["Person","Organization"],"@id":"https:\/\/cyberelk.net\/tim\/#\/schema\/person\/23b749f30a67f1b1c6af17024fc94bf6","name":"Tim Waugh","image":{"@type":"ImageObject","inLanguage":"en-GB","@id":"https:\/\/cyberelk.net\/tim\/wp-content\/uploads\/2023\/01\/printhead.png","url":"https:\/\/cyberelk.net\/tim\/wp-content\/uploads\/2023\/01\/printhead.png","contentUrl":"https:\/\/cyberelk.net\/tim\/wp-content\/uploads\/2023\/01\/printhead.png","width":731,"height":140,"caption":"Tim Waugh"},"logo":{"@id":"https:\/\/cyberelk.net\/tim\/wp-content\/uploads\/2023\/01\/printhead.png"},"sameAs":["http:\/\/cyberelk.net\/tim"],"url":"https:\/\/cyberelk.net\/tim\/author\/twaugh\/"}]}},"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/pnnS2-4f","_links":{"self":[{"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/posts\/263","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/users\/4"}],"replies":[{"embeddable":true,"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/comments?post=263"}],"version-history":[{"count":1,"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/posts\/263\/revisions"}],"predecessor-version":[{"id":1076,"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/posts\/263\/revisions\/1076"}],"wp:attachment":[{"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/media?parent=263"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/categories?post=263"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/cyberelk.net\/tim\/wp-json\/wp\/v2\/tags?post=263"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}