upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

git-merge-changelog: add doc relating to use with bzr and hg.

Browse Source
This commit is contained in:
Brian Gough
2010-08-14 19:57:11 +02:00
committed by Bruno Haible
parent 7ba06c8ff3
commit fb0f15d4d3
2 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2010-08-14 Brian Gough <bjg@gnu.org>
Bruno Haible <bruno@clisp.org>
git-merge-changelog: add doc relating to use with bzr and hg.
* lib/git-merge-changelog.c: Add comments regarding bzr, hg, diff3.
2010-08-14 Matthias Bolte <matthias.bolte@googlemail.com>
pthread: fix pthread.h creation for srcdir != builddir
lib/git-merge-changelog.c
+37 -8
View File
@@ -40,23 +40,52 @@
*/
/* Installation:
$ gnulib-tool --create-testdir --dir=/tmp/testdir123 git-merge-changelog
$ cd /tmp/testdir123
$ ./configure
$ make
$ make install
- Add to .git/config of the checkout (or to your $HOME/.gitconfig) the lines
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
driver = /usr/local/bin/git-merge-changelog %O %A %B
Additionally, for git users:
- Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
lines
- In every directory that contains a ChangeLog file, add a file
'.gitattributes' with this line:
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
driver = /usr/local/bin/git-merge-changelog %O %A %B
ChangeLog merge=merge-changelog
- In every directory that contains a ChangeLog file, add a file
'.gitattributes' with this line:
(See "man 5 gitattributes" for more info.)
ChangeLog merge=merge-changelog
(See "man 5 gitattributes" for more info.)
Additionally, for bzr users:
- Install the 'extmerge' bzr plug-in listed at
<http://doc.bazaar.canonical.com/plugins/en/index.html>
<http://wiki.bazaar.canonical.com/BzrPlugins>
- Add to your $HOME/.bazaar/bazaar.conf the line
external_merge = git-merge-changelog %b %T %o
- Then, to merge a conflict in a ChangeLog file, use
$ bzr extmerge ChangeLog
Additionally, for hg users:
- Add to your $HOME/.hgrc a couple of lines in a section [merge-tools].
See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
for reference.
*/
/* Use as an alternative to 'diff3':
git-merge-changelog performs the same role as "diff3 -m", just with
reordered arguments:
$ git-merge-changelog %O %A %B
is comparable to
$ diff3 -m %A %O %B
*/
/* Calling convention: