public inbox for gcc-cvs-wwwdocs@sourceware.org help / color / mirror / Atom feed
From: jason@gcc.gnu.org To: gcc-cvs-wwwdocs@gcc.gnu.org Subject: gcc-wwwdocs branch master updated. 87aad6f8f26d2380bf86f8c4b4d4b4b540c5cc8c Date: Sat, 11 Jan 2020 14:37:00 -0000 [thread overview] Message-ID: <20200111143742.56515.qmail@sourceware.org> (raw) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "gcc-wwwdocs". The branch, master has been updated via 87aad6f8f26d2380bf86f8c4b4d4b4b540c5cc8c (commit) from 370969e4d49ad3defb1fddaa239dbab955896a3a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 87aad6f8f26d2380bf86f8c4b4d4b4b540c5cc8c Author: Jason Merrill <jason@redhat.com> Date: Sat Jan 11 09:37:30 2020 -0500 Add information about git-merge-changelog. diff --git a/htdocs/gitwrite.html b/htdocs/gitwrite.html index f53b583..cf52e3a 100644 --- a/htdocs/gitwrite.html +++ b/htdocs/gitwrite.html @@ -29,6 +29,7 @@ maintainers and significant developers.</p> <li><a href="#checkin">Checking in a change</a></li> <li><a href="#example">Example check-in session</a></li> <li><a href="#branches">Creating and using branches</a></li> + <li><a href="#changelog">git-merge-changelog</a></li> <li><a href="#account">Tips&Tricks around your account</a></li> </ol> @@ -284,6 +285,30 @@ do not copy the entire set of ChangeLog entries. Just use something like "Merge from mainline" or similar.</p> <hr /> +<h2 id="changelog">git-merge-changelog</h2> + +git's native handling of ChangeLog merges is pretty bad, but there's a separate +git-merge-changelog tool that improves things dramatically. Some operating +system distributions have a git-merge-changelog package already, or to build it +by hand you can do + +<blockquote><pre> +git clone git://git.savannah.gnu.org/gnulib.git +cd gnulib +./gnulib-tool --create-testdir --dir=/tmp/testdir123 git-merge-changelog +cd /tmp/testdir123 +./configure +make +make install +</pre></blockquote> +And then to enable it, do +<blockquote><pre> +git config --global merge.merge-changelog.name "GNU-style ChangeLog merge driver" +git config --global merge.merge-changelog.driver "git-merge-changelog %O %A %B" +echo "ChangeLog* merge=merge-changelog" >> $GCCSRCDIR/.git/info/attributes +</pre></blockquote> + +<hr /> <h2 id="account">Tips&Tricks around your account</h2> <p>Your gcc.gnu.org account also receives e-mail (and is what you ----------------------------------------------------------------------- Summary of changes: htdocs/gitwrite.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) hooks/post-receive -- gcc-wwwdocs
reply other threads:[~2020-01-11 14:37 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200111143742.56515.qmail@sourceware.org \ --to=jason@gcc.gnu.org \ --cc=gcc-cvs-wwwdocs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).